summaryrefslogtreecommitdiff
path: root/django/db/models
diff options
context:
space:
mode:
authorSimon Meers <simon@simonmeers.com>2012-08-22 11:48:47 +1000
committerSimon Meers <simon@simonmeers.com>2012-08-22 11:48:47 +1000
commitdfe63a52effab2c8b5f72a6aceb8646f03d490bb (patch)
tree2eca3c56d76255b46b7a7ebf2cea044c4f51bc69 /django/db/models
parent13d47c3f338e1e9a5da943b97b5334c0523d2e2c (diff)
Revert "Fixed #18063 -- Avoid unicode in Model.__repr__ in python 2"
This reverts commit 3fce0d2a9162cf6e749a6de0b18890dea8955e89.
Diffstat (limited to 'django/db/models')
-rw-r--r--django/db/models/base.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index d7a9932388..fd7250cdb0 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -404,8 +404,6 @@ 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):