Commit 2bb2eecb authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[py3] Removed redundant __str__ methods. 

These classes already have an identical __unicode__ method, which
will be used after an upcoming refactoring.
parent dbb63e56

django/contrib/auth/models.py

+0 −3
Original line number Diff line number Diff line
@@ -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__)

django/contrib/databrowse/datastructures.py

+0 −3
Original line number Diff line number Diff line
@@ -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()

django/core/files/base.py

+0 −3
Original line number Diff line number Diff line
@@ -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 '')

django/template/base.py

+0 −3
Original line number Diff line number Diff line
@@ -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])

tests/modeltests/field_subclassing/fields.py

+0 −3
Original line number Diff line number Diff line
@@ -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