1 files changed, 5 insertions, 18 deletions
diff --git a/backend/zmusic/picard/util/__init__.py b/backend/zmusic/picard/util/__init__.py
index e0ad871..1b6d6cb 100644
--- a/backend/zmusic/picard/util/__init__.py
+++ b/backend/zmusic/picard/util/__init__.py
@@ -46,30 +46,17 @@ def asciipunct(s):
         u"—": u"-",
         u"―": u"--",
     }
-    for orig, repl in mapping.iteritems():
+    for orig, repl in mapping.items():
         s = s.replace(orig, repl)
     return s
 
 
 
-_io_encoding = sys.getfilesystemencoding()
-
 def encode_filename(filename):
-    """Encode unicode strings to filesystem encoding."""
-    if isinstance(filename, unicode):
-        if os.path.supports_unicode_filenames and sys.platform != "darwin":
-            return filename
-        else:
-            return filename.encode(_io_encoding, 'replace')
-    else:
-        return filename
+    return filename
 
 def decode_filename(filename):
-    """Decode strings from filesystem encoding to unicode."""
-    if isinstance(filename, unicode):
-        return filename
-    else:
-        return filename.decode(_io_encoding)
+    return filename
 
 def pathcmp(a, b):
     return os.path.normcase(a) == os.path.normcase(b)
@@ -177,7 +164,7 @@ def make_short_filename(prefix, filename, max_path_length=240, max_length=200,
                         break
 
             if left > 0:
-                raise IOError, "File name is too long."
+                raise IOError("File name is too long.")
 
     return os.path.join(*[a.strip() for a in reversed(parts)])
 
@@ -284,4 +271,4 @@ def load_release_type_scores(setting):
 
 
 def save_release_type_scores(scores):
-    return " ".join(["%s %.2f" % v for v in scores.iteritems()])
+    return " ".join(["%s %.2f" % v for v in scores.items()])