Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[py3] Removed redundant __str__ methods.

These classes already have an identical __unicode__ method, which
will be used after an upcoming refactoring.
  • Loading branch information...
commit 2bb2eecb6358ea4243ab7a6286048b86302f5128 1 parent dbb63e5
@aaugustin aaugustin authored
View
3  django/contrib/auth/models.py
@@ -419,9 +419,6 @@ def __init__(self):
def __unicode__(self):
return 'AnonymousUser'
- def __str__(self):
- return six.text_type(self).encode('utf-8')
-
def __eq__(self, other):
return isinstance(other, self.__class__)
View
3  django/contrib/databrowse/datastructures.py
@@ -97,9 +97,6 @@ def __unicode__(self):
return val[:DISPLAY_SIZE] + '...'
return val
- def __str__(self):
- return self.__unicode__().encode('utf-8')
-
def pk(self):
return self.instance._get_pk_val()
View
3  django/core/files/base.py
@@ -17,9 +17,6 @@ def __init__(self, file, name=None):
if hasattr(file, 'mode'):
self.mode = file.mode
- def __str__(self):
- return smart_bytes(self.name or '')
-
def __unicode__(self):
return smart_text(self.name or '')
View
3  django/template/base.py
@@ -85,9 +85,6 @@ def __init__(self, msg, params=()):
self.msg = msg
self.params = params
- def __str__(self):
- return six.text_type(self).encode('utf-8')
-
def __unicode__(self):
return self.msg % tuple([force_text(p, errors='replace')
for p in self.params])
View
3  tests/modeltests/field_subclassing/fields.py
@@ -18,9 +18,6 @@ def __init__(self, first, second):
def __unicode__(self):
return '%s%s' % (force_text(self.first), force_text(self.second))
- def __str__(self):
- return six.text_type(self).encode('utf-8')
-
class SmallField(models.Field):
"""
Turns the "Small" class into a Django field. Because of the similarities
View
3  tests/modeltests/serializers/models.py
@@ -87,9 +87,6 @@ def __init__(self, title):
def __unicode__(self):
raise NotImplementedError("Not so simple")
- def __str__(self):
- raise NotImplementedError("Not so simple")
-
def to_string(self):
return "%s" % self.title

0 comments on commit 2bb2eec

Please sign in to comment.
Something went wrong with that request. Please try again.