From 3fce0d2a9162cf6e749a6de0b18890dea8955e89 Mon Sep 17 00:00:00 2001 From: Simon Meers Date: Mon, 20 Aug 2012 16:47:30 +1000 Subject: Fixed #18063 -- Avoid unicode in Model.__repr__ in python 2 Thanks guettli and mrmachine. --- django/db/models/base.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'django') 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): -- cgit v1.3