diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:38:59 -0500 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-09-10 21:29:31 +0200 |
| commit | f9f792eb04dfd48d93682070583f473166b490ae (patch) | |
| tree | c66c3d474e808d664b3b24b94fdc3d5344295c4f /tests/servers | |
| parent | 960f5bc75901f76e9b4b356f98b22b494fb47611 (diff) | |
[1.6.x] Took advantage of django.utils.six.moves.urllib.*.
Backport of 6a6428a36 from master.
Diffstat (limited to 'tests/servers')
| -rw-r--r-- | tests/servers/tests.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/servers/tests.py b/tests/servers/tests.py index be74afe820..caa2ddb084 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -5,16 +5,14 @@ Tests for django.core.servers. from __future__ import unicode_literals import os -try: - from urllib.request import urlopen, HTTPError -except ImportError: # Python 2 - from urllib2 import urlopen, HTTPError from django.core.exceptions import ImproperlyConfigured from django.test import LiveServerTestCase from django.core.servers.basehttp import WSGIServerException from django.test.utils import override_settings from django.utils.http import urlencode +from django.utils.six.moves.urllib.error import HTTPError +from django.utils.six.moves.urllib.request import urlopen from django.utils._os import upath from .models import Person |
