Merge pull request #11 from spr/python-3

Moving to Python 3

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 *.swp
+*.egg-info

bin/oggify

@@ -39,13 +39,13 @@ def help(option, opt_str, value, parser):
         try:
             plugin = utils.load_plugin(parser.rargs[0], "__doc__")
         except utils.OggifyError:
-            print "Could not load help for %s" % parser.rargs[0]
-            print parser.epilog
+            print("Could not load help for %s" % parser.rargs[0])
+            print(parser.epilog)
         if plugin.__doc__ == None:
-            print "Could not load help for %s" % parser.rargs[0]
-            print parser.epilog
+            print("Could not load help for %s" % parser.rargs[0])
+            print(parser.epilog)
         else:
-            print plugin.__doc__
+            print(plugin.__doc__)
     sys.exit(0)
 
 def setup_parser(parser):
@@ -95,28 +95,28 @@ def setup_parser(parser):
 
 def verify_options(options):
     if options.quality < 0 or options.quality > 10:
-        print >>sys.stderr, "Quality %s is not between 0 and 10" % options.quality
+        print("Quality %s is not between 0 and 10" % options.quality, file=sys.stderr)
         return False
     if options.source_plugin not in utils.list_plugins('decode'):
-        print >>sys.stderr, "%s not an input plugin" % options.source_plugin
+        print("%s not an input plugin" % options.source_plugin, file=sys.stderr)
         return False
     if options.output_plugin not in utils.list_plugins('encode'):
-        print >>sys.stderr, "%s not an output plugin" % options.output_plugin
+        print("%s not an output plugin" % options.output_plugin, file=sys.stderr)
         return False
     if options.nice < -20 or options.nice > 19:
-        print >>sys.stderr, "Nice value %s not between -20 and 18" % options.nice
+        print("Nice value %s not between -20 and 18" % options.nice, file=sys.stderr)
         return False
     if options.retag and options.refresh:
-        print >>sys.stderr, "--retag and --refresh are mutually exclusive"
+        print("--retag and --refresh are mutually exclusive", file=sys.stderr)
         return False
     return True
 
 def verify_args(args):
     if len(args) != 2:
-        print >>sys.stderr, "Need to specify a source and destination only."
+        print("Need to specify a source and destination only.", file=sys.stderr)
         return False
     if not os.path.exists(args[0]):
-        print >>sys.stderr, "%s does not exist, not a valid src directory" % args[0]
+        print("%s does not exist, not a valid src directory" % args[0], file=sys.stderr)
         return False
     return True
 

oggify/__init__.py

@@ -18,10 +18,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import os, os.path, sys, re, tempfile, shutil, atexit
-from dircache import listdir
 from oggify import utils
 
-version = '2.0.7'
+version = '2.2.0'
 
 class Oggify(object):
     """Class for the oggify object that does all the work for Oggify"""
@@ -80,9 +79,9 @@ def __init__(self, src, dst, options, decoder, encoder,
                         self._decoder.extension, self._encoder.extension,
                         self._symlinks, self._ignore_subtrees)
 
-        self._encode_k = self._encode.keys()
+        self._encode_k = list(self._encode.keys())
         self._encode_k.sort()
-        self._reencode_k = self._reencode.keys()
+        self._reencode_k = list(self._reencode.keys())
         self._reencode_k.sort()
 
     def encode_file(self, src, dst):
@@ -101,7 +100,7 @@ def encode_file(self, src, dst):
                 self._nice, self._output)
         return_code = encode_process.wait()
         if (returncode != 0):
-            print "Failed to encode %s. Return code: %d" % (src, returncode)
+            print("Failed to encode %s. Return code: %d" % (src, returncode))
 
         shutil.copyfile(self._encode_temp_file, dst)
         self._encoder.set_tags(dst, self._decoder.get_tags(src))
@@ -114,7 +113,7 @@ def encode(self, act=True):
         """
         for src in self._encode_k:
             dst = self._encode[src]
-            print "Encoding %s to %s" % (src, dst)
+            print("Encoding %s to %s" % (src, dst))
             if act:
                 self.encode_file(src, dst)
 
@@ -127,7 +126,7 @@ def reencode(self, act=True):
         for src in self._reencode_k:
             dst = self._reencode[src]
             if os.path.getmtime(src) > os.path.getmtime(dst):
-                print "Re-encoding %s to %s" % (src, dst)
+                print("Re-encoding %s to %s" % (src, dst))
                 if act:
                     self.encode_file(src, dst)
 
@@ -140,13 +139,13 @@ def retag(self, act=True):
         for src in self._reencode_k:
             dst = self._reencode[src]
             if os.path.getmtime(src) > os.path.getmtime(dst):
-                print "Retagging %s with %s" % (dst, src)
+                print("Retagging %s with %s" % (dst, src))
                 if act:
                     self._encoder.set_tags(dst, self._decoder.get_tags(src))
 
     def _rm_list(self, items, act):
         for item in items:
-            print "Removing %s" % item
+            print("Removing %s" % item)
             if act:
                 if os.path.isdir(item):
                     shutil.rmtree(item, True)

oggify/utils.py

@@ -25,7 +25,7 @@
 
 import os, os.path, sys, re
 
-class OggifyError(StandardError):
+class OggifyError(Exception):
     """Runtime error for Oggify"""
     pass
 

setup.py

@@ -38,7 +38,7 @@
           'License :: OSI Approved :: GNU General Public License (GPL)',
           'Operating System :: MacOS :: MacOS X',
           'Operating System :: POSIX :: Linux',
-          'Programming Language :: Python',
+          'Programming Language :: Python :: 3 :: Only',
           'Topic :: Multimedia :: Sound/Audio :: Conversion',
           ]
      )

test/testbasic.py

@@ -89,16 +89,14 @@ def check_files(files):
     return ret
 
 def compare_timestamps(left, right, mode):
+    left_mtimes = [path.getmtime(x) for x in left]
+    right_mtimes = [path.getmtime(x) for x in right]
     if mode == '<':
-        expected_result = -1
+        return left_mtimes < right_mtimes
     elif mode == '==':
-        expected_result = 0
+        return left_mtimes == right_mtimes
     else:
-        expected_result = 1
-    for l,r in zip(left, right):
-        if cmp(path.getmtime(l), path.getmtime(r)) != expected_result:
-            return False
-    return True
+        return left_mtimes > right_mtimes
 
 class AttrHash(object):
     def __init__(self, hash):
@@ -121,6 +119,7 @@ def setUp(self):
                 'nice': 10,
                 'quality': 5,
                 'follow_symlinks': False,
+                'ignore_subtrees': True,
             })
         make_files(self.src)
 
@@ -134,7 +133,7 @@ def testencode(self):
         """Validate that on a new dst tree, only encode is present"""
         oggify = Oggify(self.src_dir, self.dst_dir, self.options, 
                 self.decoder, self.encoder, '/dev/null')
-        sev = oggify._encode.values()
+        sev = list(oggify._encode.values())
         sev.sort()
 
         self.assertEqual(oggify._encode_k, self.src)
@@ -156,7 +155,7 @@ def testnewfileencode(self):
 
         oggify = Oggify(self.src_dir, self.dst_dir, self.options,
                 self.decoder, self.encoder, '/dev/null')
-        sev = oggify._encode.values()
+        sev = list(oggify._encode.values())
         sev.sort()
 
         self.assertEqual(oggify._encode_k, add_src)
@@ -171,7 +170,7 @@ def testreencode(self):
 
         oggify = Oggify(self.src_dir, self.dst_dir, self.options,
                 self.decoder, self.encoder, '/dev/null')
-        rev = oggify._reencode.values()
+        rev = list(oggify._reencode.values())
         rev.sort()
 
         self.assertEqual(oggify._reencode_k, self.src)
@@ -232,6 +231,7 @@ def setUp(self):
                 'nice': 10,
                 'quality': 5,
                 'follow_symlinks': False,
+                'ignore_subtrees': True,
             })
         make_files(self.src)
 
@@ -245,7 +245,7 @@ def testencode(self):
         """Validate that encode works correctly"""
         oggify = Oggify(self.src_dir, self.dst_dir, self.options,
                 self.decoder, self.encoder)
-        sev = oggify._encode.values()
+        sev = list(oggify._encode.values())
         sev.sort()
 
         oggify.encode()
@@ -264,7 +264,7 @@ def testnewfileencode(self):
 
         oggify = Oggify(self.src_dir, self.dst_dir, self.options,
                 self.decoder, self.encoder)
-        sev = oggify._encode.values()
+        sev = list(oggify._encode.values())
         sev.sort()
 
         oggify.encode()