summaryrefslogtreecommitdiff
path: root/django/forms/widgets.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms/widgets.py')
-rw-r--r--django/forms/widgets.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index f2446efcdf..6b1be37ec2 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -7,7 +7,10 @@ from __future__ import absolute_import, unicode_literals
import copy
import datetime
from itertools import chain
-from urlparse import urljoin
+try:
+ from urllib.parse import urljoin
+except ImportError: # Python 2
+ from urlparse import urljoin
from django.conf import settings
from django.forms.util import flatatt, to_current_timezone