summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-28 07:35:27 -0500
committerTim Graham <timograham@gmail.com>2015-02-06 08:16:28 -0500
commit0ed7d155635da9f79d4dd67e4889087d3673c6da (patch)
treecf5c59b563f01774f32e20b3af8cb24a387fdc4d /django/utils/encoding.py
parent388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff)
Sorted imports with isort; refs #23860.
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