[1.6.x] Took advantage of django.utils.six.moves.urllib.*.

Backport of 6a6428a36 from master.

1 files changed, 1 insertions, 4 deletions

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 116178c4c2..ad06336c4d 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -4,14 +4,11 @@ import codecs
 import datetime
 from decimal import Decimal
 import locale
-try:
-    from urllib.parse import quote
-except ImportError:     # Python 2
-    from urllib import quote
 import warnings
 
 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):