mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

[py3] Updated urllib/urllib2/urlparse imports.

Browse Source 
Lots of functions were moved. Use explicit imports in all cases
to keey it easy to identify where the functions come from.
This commit is contained in:
Aymeric Augustin
2012-07-20 15:36:52 +02:00
parent bdca5ea345
commit 0d914d08a0
32 changed files with 181 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/regressiontests/admin_views/tests.py
View File

@@ -4,7 +4,10 @@ from __future__ import absolute_import, unicode_literals
import os
import re
import datetime
import urlparse
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
@@ -3199,7 +3202,7 @@ class RawIdFieldsTest(TestCase):
popup_url = m.groups()[0].replace("&", "&")
# Handle relative links
popup_url = urlparse.urljoin(response.request['PATH_INFO'], popup_url)
popup_url = urljoin(response.request['PATH_INFO'], popup_url)
# Get the popup
response2 = self.client.get(popup_url)
self.assertContains(response2, "Spain")