Skip to content

Commit

Permalink
Refs #27753 -- Removed django.utils.six.
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Feb 5, 2019
1 parent efe28d3 commit 4138481
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 900 deletions.
5 changes: 0 additions & 5 deletions django/utils/encoding.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from decimal import Decimal
from urllib.parse import quote

from django.utils import six
from django.utils.functional import Promise


Expand All @@ -17,10 +16,6 @@ def __str__(self):
return '%s. You passed in %r (%s)' % (super().__str__(), self.obj, type(self.obj))


# For backwards compatibility. (originally in Django, then added to six 1.9)
python_2_unicode_compatible = six.python_2_unicode_compatible


def smart_text(s, encoding='utf-8', strings_only=False, errors='strict'):
"""
Return a string representing 's'. Treat bytestrings using the 'encoding'
Expand Down
Loading

0 comments on commit 4138481

Please sign in to comment.