From a8b70d251d238b4e6cfc7bb4296da15494f8dff3 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 9 Feb 2015 13:19:34 -0500 Subject: [1.8.x] Sorted imports with isort; refs #23860. Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master --- django/utils/encoding.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'django/utils/encoding.py') 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 -- cgit v1.3