Fix unicode handling in "gmg addmedia".

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 12757eda5fbe0c09b9131ec82d3c3fe1c85beea9..8f722cff456bb420951637b55d97b1cd90c7dc97 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -489,7 +489,11 @@ class MediaEntry(Base, MediaEntryMixin):
         return import_component(self.media_type + '.models:BACKREF_NAME')
 
     def __repr__(self):
-        safe_title = self.title.encode('ascii', 'replace')
+        if six.PY2:
+            # obj.__repr__() should return a str on Python 2
+            safe_title = self.title.encode('utf-8', 'replace')
+        else:
+            safe_title = self.title
 
         return '<{classname} {id}: {title}>'.format(
                 classname=self.__class__.__name__,

diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py
index b741b96f9a3080e9dbf8238ba779e52721a0e810..2aa8f96a6fa100b6d747a1a4ac74b2595d6c93f7 100644 (file)
--- a/mediagoblin/gmg_commands/addmedia.py
+++ b/mediagoblin/gmg_commands/addmedia.py
@@ -88,14 +88,15 @@ def addmedia(args):
         # this is kinda terrible
         if some_string is None:
             return None
-        else:
-            return six.text_type(some_string)
+        if six.PY2:
+            return six.text_type(some_string, 'utf-8')
+        return some_string
 
     try:
         submit_media(
             mg_app=app,
             user=user,
-            submitted_file=open(abs_filename, 'r'), filename=filename,
+            submitted_file=open(abs_filename, 'rb'), filename=filename,
             title=maybe_unicodeify(args.title),
             description=maybe_unicodeify(args.description),
             license=maybe_unicodeify(args.license),