summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSimon Meers <simon@simonmeers.com>2012-08-20 16:47:30 +1000
committerSimon Meers <simon@simonmeers.com>2012-08-20 16:47:30 +1000
commit3fce0d2a9162cf6e749a6de0b18890dea8955e89 (patch)
tree437cfd55c46576628ceb9bec789ab097d825a314 /django
parent30bdf22bc7a262858b02b65b0ed154dec46d911d (diff)
Fixed #18063 -- Avoid unicode in Model.__repr__ in python 2
Thanks guettli and mrmachine.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index fd7250cdb0..d7a9932388 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -404,6 +404,8 @@ class Model(six.with_metaclass(ModelBase, object)):
u = six.text_type(self)
except (UnicodeEncodeError, UnicodeDecodeError):
u = '[Bad Unicode data]'
+ if not six.PY3:
+ u = u.encode('ascii', 'replace')
return smart_str('<%s: %s>' % (self.__class__.__name__, u))
def __str__(self):