diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-06-03 01:41:44 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-06-03 01:41:44 +0300 |
| commit | dce76c3ee7153e8340cb3d64e8ee4df23a545bc4 (patch) | |
| tree | fff63e4a42fc87468ef360641ea8a74ed14d0b1e | |
| parent | f9a7201c32a42f31ac7c0c8568e80c8fbf5aec32 (diff) | |
| download | mediagoblin-dce76c3ee7153e8340cb3d64e8ee4df23a545bc4.tar.lz mediagoblin-dce76c3ee7153e8340cb3d64e8ee4df23a545bc4.tar.xz mediagoblin-dce76c3ee7153e8340cb3d64e8ee4df23a545bc4.zip | |
Sync py2_unicode decorator with Django.
| -rw-r--r-- | mediagoblin/_compat.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/_compat.py b/mediagoblin/_compat.py index c38e0727..ab5dbcf6 100644 --- a/mediagoblin/_compat.py +++ b/mediagoblin/_compat.py @@ -1,5 +1,3 @@ -import sys - from six import PY3, iteritems from mediagoblin import mg_globals @@ -17,8 +15,13 @@ else: ungettext = mg_globals.thread_scope.translations.ungettext +# taken from https://github.com/django/django/blob/master/django/utils/encoding.py def py2_unicode(klass): 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.__str__ = lambda self: self.__unicode__().encode('utf-8') return klass |