diff options
| -rw-r--r-- | django/contrib/auth/models.py | 3 | ||||
| -rw-r--r-- | django/contrib/databrowse/datastructures.py | 3 | ||||
| -rw-r--r-- | django/core/files/base.py | 3 | ||||
| -rw-r--r-- | django/template/base.py | 3 | ||||
| -rw-r--r-- | tests/modeltests/field_subclassing/fields.py | 3 | ||||
| -rw-r--r-- | tests/modeltests/serializers/models.py | 3 |
6 files changed, 0 insertions, 18 deletions
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index 1099aa195b..a39165c92c 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -419,9 +419,6 @@ class AnonymousUser(object): 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__) diff --git a/django/contrib/databrowse/datastructures.py b/django/contrib/databrowse/datastructures.py index 810e039894..e48383f438 100644 --- a/django/contrib/databrowse/datastructures.py +++ b/django/contrib/databrowse/datastructures.py @@ -97,9 +97,6 @@ class EasyInstance(object): return val[:DISPLAY_SIZE] + '...' return val - def __str__(self): - return self.__unicode__().encode('utf-8') - def pk(self): return self.instance._get_pk_val() diff --git a/django/core/files/base.py b/django/core/files/base.py index d0b25250a5..87fa8bc8ec 100644 --- a/django/core/files/base.py +++ b/django/core/files/base.py @@ -17,9 +17,6 @@ class File(FileProxyMixin): 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 '') diff --git a/django/template/base.py b/django/template/base.py index 661d8c092a..4dcba6dd2b 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -85,9 +85,6 @@ class VariableDoesNotExist(Exception): 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]) diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/modeltests/field_subclassing/fields.py index 0d4ff98aa7..47d710717b 100644 --- a/tests/modeltests/field_subclassing/fields.py +++ b/tests/modeltests/field_subclassing/fields.py @@ -18,9 +18,6 @@ class Small(object): 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 diff --git a/tests/modeltests/serializers/models.py b/tests/modeltests/serializers/models.py index 9da099c027..ebae7605b4 100644 --- a/tests/modeltests/serializers/models.py +++ b/tests/modeltests/serializers/models.py @@ -87,9 +87,6 @@ class Team(object): def __unicode__(self): raise NotImplementedError("Not so simple") - def __str__(self): - raise NotImplementedError("Not so simple") - def to_string(self): return "%s" % self.title |