1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

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

This commit is contained in:
Aymeric Augustin
2013-09-05 14:38:59 -05:00
parent ed9cd4fd8b
commit 6a6428a36f
31 changed files with 50 additions and 152 deletions

View File

@@ -1,10 +1,6 @@
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