From f9f792eb04dfd48d93682070583f473166b490ae Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 5 Sep 2013 14:38:59 -0500 Subject: [1.6.x] Took advantage of django.utils.six.moves.urllib.*. Backport of 6a6428a36 from master. --- django/utils/encoding.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'django/utils/encoding.py') 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): -- cgit v1.3