Commit 6a6428a3 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Took advantage of django.utils.six.moves.urllib.*.

parent ed9cd4fd

django/contrib/auth/decorators.py

+1 −4
Original line number Diff line number Diff line 
try:

    from urllib.parse import urlparse

except ImportError:     # Python 2

    from urlparse import urlparse

from functools import wraps

from django.conf import settings

from django.contrib.auth import REDIRECT_FIELD_NAME

from django.core.exceptions import PermissionDenied

from django.utils.decorators import available_attrs

from django.utils.encoding import force_str

from django.utils.six.moves.urllib.parse import urlparse

from django.shortcuts import resolve_url

django/contrib/auth/tests/test_views.py

+1 −4
Original line number Diff line number Diff line 
import itertools

import os

import re

try:

    from urllib.parse import urlparse, ParseResult

except ImportError:     # Python 2

    from urlparse import urlparse, ParseResult



from django.conf import global_settings, settings

from django.contrib.sites.models import Site, RequestSite
@@ -15,6 +11,7 @@ from django.core.urlresolvers import reverse, NoReverseMatch 
from django.http import QueryDict, HttpRequest

from django.utils.encoding import force_text

from django.utils.http import urlquote

from django.utils.six.moves.urllib.parse import urlparse, ParseResult

from django.utils._os import upath

from django.test import TestCase

from django.test.utils import override_settings, patch_logger

django/contrib/auth/views.py

+1 −5
Original line number Diff line number Diff line 
try:

    from urllib.parse import urlparse, urlunparse

except ImportError:     # Python 2

    from urlparse import urlparse, urlunparse



from django.conf import settings

from django.core.urlresolvers import reverse

from django.http import HttpResponseRedirect, QueryDict

from django.template.response import TemplateResponse

from django.utils.http import is_safe_url, urlsafe_base64_decode

from django.utils.translation import ugettext as _

from django.utils.six.moves.urllib.parse import urlparse, urlunparse

from django.shortcuts import resolve_url

from django.views.decorators.debug import sensitive_post_parameters

from django.views.decorators.cache import never_cache

django/contrib/comments/views/utils.py

+1 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ A few bits of helper functions for comment views. 
"""



import textwrap

try:

    from urllib.parse import urlencode

except ImportError:     # Python 2

    from urllib import urlencode



from django.http import HttpResponseRedirect

from django.shortcuts import render_to_response, resolve_url
@@ -14,6 +10,7 @@ from django.template import RequestContext 
from django.core.exceptions import ObjectDoesNotExist

from django.contrib import comments

from django.utils.http import is_safe_url

from django.utils.six.moves.urllib.parse import urlencode



def next_redirect(request, fallback, **get_kwargs):

    """

django/contrib/sitemaps/__init__.py

+2 −5
Original line number Diff line number Diff line 
from django.contrib.sites.models import Site

from django.core import urlresolvers, paginator

from django.core.exceptions import ImproperlyConfigured

try:

    from urllib.parse import urlencode

    from urllib.request import urlopen

except ImportError:     # Python 2

    from urllib import urlencode, urlopen

from django.utils.six.moves.urllib.parse import urlencode

from django.utils.six.moves.urllib.request import urlopen



PING_URL = "http://www.google.com/webmasters/tools/ping"