mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00
Code Issues 32 Releases Wiki Activity

Refs #23919 -- Removed support for broken Model.__str__() in Model.__repr__().

Browse Source 
Returning invalid bytestrings in __str__() is unlikely in Python 3.
This commit is contained in:
Tim Graham 2017-06-11 15:52:19 -04:00 committed by GitHub
parent 3eb3907bb1
commit 3d0a0ecd2c
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/base.py
View File

@ -498,11 +498,7 @@ class Model(metaclass=ModelBase):
return new return new
def __repr__(self): def __repr__(self):
try: return '<%s: %s>' % (self.__class__.__name__, self)
u = str(self)
except (UnicodeEncodeError, UnicodeDecodeError):
u = '[Bad Unicode data]'
return '<%s: %s>' % (self.__class__.__name__, u)
def __str__(self): def __str__(self):
return '%s object (%s)' % (self.__class__.__name__, self.pk) return '%s object (%s)' % (self.__class__.__name__, self.pk)

8
tests/model_regress/models.py
View File

@ -52,14 +52,6 @@ class Worker(models.Model):
return self.name return self.name
class BrokenStrMethod(models.Model):
name = models.CharField(max_length=7)
def __str__(self):
# Intentionally broken (invalid start byte in byte string).
return b'Name\xff: %s'.decode() % self.name
class NonAutoPK(models.Model): class NonAutoPK(models.Model):
name = models.CharField(max_length=10, primary_key=True) name = models.CharField(max_length=10, primary_key=True)

9
tests/model_regress/tests.py
View File

@ -8,8 +8,8 @@ from django.test import TestCase, skipUnlessDBFeature
from django.utils.timezone import get_fixed_timezone from django.utils.timezone import get_fixed_timezone
from .models import ( from .models import (
Article, BrokenStrMethod, Department, Event, Model1, Model2, Model3, Article, Department, Event, Model1, Model2, Model3, NonAutoPK, Party,
NonAutoPK, Party, Worker, Worker,
) )
@ -186,11 +186,6 @@ class ModelTests(TestCase):
w = Worker.objects.create(department=d, name="Full-time") w = Worker.objects.create(department=d, name="Full-time")
self.assertEqual(str(w), "Full-time") self.assertEqual(str(w), "Full-time")
def test_broken_unicode(self):
# Models with broken __str__() methods have a printable repr().
b = BrokenStrMethod.objects.create(name='Jerry')
self.assertEqual(repr(b), '<BrokenStrMethod: [Bad Unicode data]>')
@skipUnlessDBFeature("supports_timezones") @skipUnlessDBFeature("supports_timezones")
def test_timezones(self): def test_timezones(self):
# Saving an updating with timezone-aware datetime Python objects. # Saving an updating with timezone-aware datetime Python objects.