summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-09 13:19:34 -0500
committerTim Graham <timograham@gmail.com>2015-02-09 14:24:06 -0500
commita8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch)
tree94ef5bc53e59131906aecfcf792eeac86242aa62 /django/utils/encoding.py
parenteb406aa686ff1809903366ef6896037af2f1f69b (diff)
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
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