From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 2 Jun 2014 22:41:44 +0000 (+0300)
Subject: Sync py2_unicode decorator with Django.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dce76c3ee7153e8340cb3d64e8ee4df23a545bc4;p=mediagoblin.git

Sync py2_unicode decorator with Django.
---

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