heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync py2_unicode decorator with Django.

Browse Source
This commit is contained in:
Berker Peksag 2014-06-03 01:41:44 +03:00
parent f9a7201c32
commit dce76c3ee7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mediagoblin/_compat.py
View File

@ -1,5 +1,3 @@
import sys
from six import PY3, iteritems from six import PY3, iteritems
from mediagoblin import mg_globals from mediagoblin import mg_globals
@ -17,8 +15,13 @@ else:
ungettext = mg_globals.thread_scope.translations.ungettext ungettext = mg_globals.thread_scope.translations.ungettext
# taken from https://github.com/django/django/blob/master/django/utils/encoding.py
def py2_unicode(klass): def py2_unicode(klass):
if not PY3: if not PY3:
if '__str__' not in klass.__dict__:
raise ValueError("@py2_unicode cannot be applied "
"to %s because it doesn't define __str__()." %
klass.__name__)
klass.__unicode__ = klass.__str__ klass.__unicode__ = klass.__str__
klass.__str__ = lambda self: self.__unicode__().encode('utf-8') klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
return klass return klass