summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 40096741a7..99c9da843a 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -3,12 +3,13 @@ from __future__ import unicode_literals
import codecs
import datetime
-from decimal import Decimal
import locale
+from decimal import Decimal
-from django.utils.functional import Promise
from django.utils import six
+from django.utils.functional import Promise
from django.utils.six.moves.urllib.parse import quote, unquote
+
if six.PY3:
from urllib.parse import unquote_to_bytes