mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.9.x] Fixed #25730 -- Made Model.__str__() always return str instances.

Browse Source 
Thanks to Kevin Turner for the report and Tim for the review.

Backport of 4cd5d846d4 from master
This commit is contained in:
Simon Charette
2015-11-11 01:30:19 -05:00
parent 15cf906643
commit 946e7679f3
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,7 +464,7 @@ class Model(six.with_metaclass(ModelBase)):
def __str__(self):
if six.PY2 and hasattr(self, '__unicode__'):
return force_text(self).encode('utf-8')
return '%s object' % self.__class__.__name__
return str('%s object' % self.__class__.__name__)
def __eq__(self, other):
if not isinstance(other, Model):