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

[py3] Avoided returning bytes in Model.__str__

Browse Source 
on Python 3.
This commit is contained in:
Aymeric Augustin
2012-08-11 22:15:05 +02:00
parent 9e7b5ba50f
commit dbb63e56ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,7 +407,7 @@ class Model(six.with_metaclass(ModelBase, object)):
return smart_bytes('<%s: %s>' % (self.__class__.__name__, u)) return smart_bytes('<%s: %s>' % (self.__class__.__name__, u))
def __str__(self): def __str__(self):
if hasattr(self, '__unicode__'): if not six.PY3 and hasattr(self, '__unicode__'):
return force_text(self).encode('utf-8') return force_text(self).encode('utf-8')
return '%s object' % self.__class__.__name__ return '%s object' % self.__class__.__name__