From dfe63a52effab2c8b5f72a6aceb8646f03d490bb Mon Sep 17 00:00:00 2001 From: Simon Meers Date: Wed, 22 Aug 2012 11:48:47 +1000 Subject: [PATCH] Revert "Fixed #18063 -- Avoid unicode in Model.__repr__ in python 2" This reverts commit 3fce0d2a9162cf6e749a6de0b18890dea8955e89. --- django/db/models/base.py | 2 -- tests/regressiontests/model_regress/tests.py | 10 ---------- 2 files changed, 12 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): diff --git a/tests/regressiontests/model_regress/tests.py b/tests/regressiontests/model_regress/tests.py index 6a03b861e4..6a45a83052 100644 --- a/tests/regressiontests/model_regress/tests.py +++ b/tests/regressiontests/model_regress/tests.py @@ -1,5 +1,3 @@ -# coding: utf-8 - from __future__ import absolute_import, unicode_literals import datetime @@ -148,14 +146,6 @@ class ModelTests(TestCase): b = BrokenUnicodeMethod.objects.create(name="Jerry") self.assertEqual(repr(b), "") - def test_no_unicode_in_repr(self): - a = Article.objects.create( - headline="Watch for umlauts: üöä", pub_date=datetime.datetime.now()) - if six.PY3: - self.assertEqual(repr(a), '') - else: - self.assertEqual(repr(a), '') - @skipUnlessDBFeature("supports_timezones") def test_timezones(self): # Saving an updating with timezone-aware datetime Python objects.