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. --- tests/admin_views/tests.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/admin_views') diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 28dea38cfd..2ec5c87949 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -4,10 +4,6 @@ from __future__ import absolute_import, unicode_literals import os import re import datetime -try: - from urllib.parse import urljoin -except ImportError: # Python 2 - from urlparse import urljoin from django.conf import settings, global_settings from django.core import mail @@ -30,14 +26,17 @@ from django.forms.util import ErrorList from django.template.response import TemplateResponse from django.test import TestCase from django.test.utils import patch_logger -from django.utils import formats, translation, unittest +from django.test.utils import override_settings +from django.utils import formats +from django.utils import translation +from django.utils import unittest from django.utils.cache import get_max_age from django.utils.encoding import iri_to_uri, force_bytes from django.utils.html import escape from django.utils.http import urlencode, urlquote +from django.utils.six.moves.urllib.parse import urljoin from django.utils._os import upath from django.utils import six -from django.test.utils import override_settings # local test models from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount, -- cgit v1.3