diff options
Diffstat (limited to 'mediagoblin/_compat.py')
| -rw-r--r-- | mediagoblin/_compat.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mediagoblin/_compat.py b/mediagoblin/_compat.py index 65fb5140..5a3fac53 100644 --- a/mediagoblin/_compat.py +++ b/mediagoblin/_compat.py @@ -1,23 +1,15 @@ -from six import PY3, iteritems - -from mediagoblin import mg_globals +from six import PY3 if PY3: from email.mime.text import MIMEText - from urllib import parse as urlparse - # TODO(berker): Rename to gettext and ungettext instead? - ugettext = mg_globals.thread_scope.translations.gettext - ungettext = mg_globals.thread_scope.translations.ngettext else: from email.MIMEText import MIMEText - import urlparse - ugettext = mg_globals.thread_scope.translations.ugettext - ungettext = mg_globals.thread_scope.translations.ungettext # taken from # https://github.com/django/django/blob/master/django/utils/encoding.py def py2_unicode(klass): + # TODO: Add support for __repr__ if not PY3: if '__str__' not in klass.__dict__: raise ValueError("@py2_unicode cannot be applied " |