Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.6.x] Replaced urllib/urlparse imports with from django.utils.six.m…

…oves.

Backport of 981b864 from master
  • Loading branch information...
commit f0d03d41be380b973c154507baae1ff498de2dbd 1 parent a5297c1
@timgraham timgraham authored
View
6 django/contrib/admin/templatetags/admin_urls.py
@@ -1,12 +1,8 @@
-try:
- from urllib.parse import parse_qsl, urlparse, urlunparse
-except ImportError:
- from urlparse import parse_qsl, urlparse, urlunparse
-
from django import template
from django.contrib.admin.util import quote
from django.core.urlresolvers import Resolver404, get_script_prefix, resolve
from django.utils.http import urlencode
+from django.utils.six.moves.urllib.parse import parse_qsl, urlparse, urlunparse
register = template.Library()
View
6 django/http/request.py
@@ -6,11 +6,6 @@
import sys
from io import BytesIO
from pprint import pformat
-try:
- from urllib.parse import parse_qsl, urlencode, quote, urljoin
-except ImportError:
- from urllib import urlencode, quote
- from urlparse import parse_qsl, urljoin
from django.conf import settings
from django.core import signing
@@ -20,6 +15,7 @@
from django.utils import six
from django.utils.datastructures import MultiValueDict, ImmutableList
from django.utils.encoding import force_bytes, force_text, force_str, iri_to_uri
+from django.utils.six.moves.urllib.parse import parse_qsl, urlencode, quote, urljoin
RAISE_ERROR = object()
View
5 django/http/response.py
@@ -4,10 +4,6 @@
import time
import warnings
from email.header import Header
-try:
- from urllib.parse import urlparse
-except ImportError:
- from urlparse import urlparse
from django.conf import settings
from django.core import signals
@@ -18,6 +14,7 @@
from django.utils.encoding import force_bytes, force_text, iri_to_uri
from django.utils.http import cookie_date
from django.utils.six.moves import map
+from django.utils.six.moves.urllib.parse import urlparse
# See http://www.iana.org/assignments/http-status-codes
View
2  docs/ref/urlresolvers.txt
@@ -166,9 +166,9 @@ A :class:`ResolverMatch` object can also be assigned to a triple::
One possible use of :func:`~django.core.urlresolvers.resolve` would be to test
whether a view would raise a ``Http404`` error before redirecting to it::
- from urlparse import urlparse
from django.core.urlresolvers import resolve
from django.http import HttpResponseRedirect, Http404
+ from django.utils.six.moves.urllib.parse import urlparse
def myview(request):
next = request.META.get('HTTP_REFERER', None) or '/'
Please sign in to comment.
Something went wrong with that request. Please try again.