diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:38:59 -0500 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:39:23 -0500 |
| commit | 6a6428a36f221446b17eaf4876e92d3db1781962 (patch) | |
| tree | a57290e315203b770a56b0d4691ee2d4d104cccc /django/utils/encoding.py | |
| parent | ed9cd4fd8b425ab5010b27aefc7ef6e50d55fb54 (diff) | |
| download | django-6a6428a36f221446b17eaf4876e92d3db1781962.tar.gz | |
Took advantage of django.utils.six.moves.urllib.*.
Diffstat (limited to 'django/utils/encoding.py')
| -rw-r--r-- | django/utils/encoding.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py index bb7c38fea8..d31c27fe80 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -4,13 +4,10 @@ import codecs import datetime from decimal import Decimal import locale -try: - from urllib.parse import quote -except ImportError: # Python 2 - from urllib import quote from django.utils.functional import Promise from django.utils import six +from django.utils.six.moves.urllib.parse import quote class DjangoUnicodeDecodeError(UnicodeDecodeError): def __init__(self, obj, *args): |