Commits

Travis Shirk committed be20bf2 Merge

merge

Comments (0)

Files changed (1)

src/eyed3/plugins/classic.py

                     data = fp.read()
             except:
                 raise ValueError("Unable to read file")
-            return (unicode(data), desc, lang)
+            return (unicode(data, LOCAL_ENCODING), desc, lang)
         def PlayCountArg(pc):
             if not pc:
                 raise ValueError("value required")
                 if mt is None:
                     raise ValueError("Cannot determine mime-type")
 
-            return (path, type_id, mt, unicode(desc))
+            return (path, type_id, mt, unicode(desc, LOCAL_ENCODING))
         def ObjectArg(s):
             '''OBJ_PATH:MIME-TYPE[:DESCRIPTION[:FILENAME]],
             Returns (path, mime_type, description, filename)'''