summaryrefslogtreecommitdiff
path: root/django/test/testcases.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/test/testcases.py')
-rw-r--r--django/test/testcases.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index eb7bd70d12..b9aae21e8e 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -7,7 +7,10 @@ import re
import sys
from copy import copy
from functools import wraps
-from urlparse import urlsplit, urlunsplit
+try:
+ from urllib.parse import urlsplit, urlunsplit
+except ImportError: # Python 2
+ from urlparse import urlsplit, urlunsplit
from xml.dom.minidom import parseString, Node
import select
import socket