From 896d00fbf22f5701f811bb4cea28b01cbb618ee1 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 25 Jun 2015 22:24:03 +0300
Subject: Change all unicode() calls with six.text_type().

Fixes #5329.
---
 mediagoblin/media_types/audio/processing.py | 4 +++-
 mediagoblin/media_types/video/processing.py | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'mediagoblin/media_types')

diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py
index c1f6cb6b..427309de 100644
--- a/mediagoblin/media_types/audio/processing.py
+++ b/mediagoblin/media_types/audio/processing.py
@@ -18,6 +18,8 @@ import argparse
 import logging
 import os
 
+import six
+
 from mediagoblin import mg_globals as mgg
 from mediagoblin.processing import (
     BadMediaFail, FilenameBuilder,
@@ -39,7 +41,7 @@ def sniff_handler(media_file, filename):
     try:
         data = discover(media_file.name)
     except Exception as e:
-        _log.info(unicode(e))
+        _log.info(six.text_type(e))
         return None
     if data and data.get_audio_streams() and not data.get_video_streams():
         return MEDIA_TYPE
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index a85b232c..0cdfbdce 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -19,6 +19,8 @@ import os.path
 import logging
 import datetime
 
+import six
+
 from mediagoblin import mg_globals as mgg
 from mediagoblin.processing import (
     FilenameBuilder, BaseProcessingFail,
@@ -52,8 +54,8 @@ def sniffer(media_file):
         data = transcoders.discover(media_file.name)
     except Exception as e:
         # this is usually GLib.GError, but we don't really care which one
-        _log.warning(u'GStreamer: {0}'.format(unicode(e)))
-        raise MissingComponents(u'GStreamer: {0}'.format(unicode(e)))
+        _log.warning(u'GStreamer: {0}'.format(six.text_type(e)))
+        raise MissingComponents(u'GStreamer: {0}'.format(six.text_type(e)))
     _log.debug('Discovered: {0}'.format(data))
 
     if not data.get_video_streams():
@@ -110,7 +112,7 @@ def get_tags(stream_info):
             dt.get_microsecond()).isoformat()
     for k, v in tags.items():
         # types below are accepted by json; others must not present
-        if not isinstance(v, (dict, list, basestring, int, float, bool,
+        if not isinstance(v, (dict, list, six.string_types, int, float, bool,
                               type(None))):
             del tags[k]
     return dict(tags)
-- 
cgit v1.2.3