summaryrefslogtreecommitdiff
path: root/django/shortcuts.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-12-29 16:27:49 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 20:18:46 +0100
commit7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch)
tree313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /django/shortcuts.py
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
downloaddjango-7b2f2e74adb36a4334e83130f6abc2f79d395235.tar.gz
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/shortcuts.py')
-rw-r--r--django/shortcuts.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/shortcuts.py b/django/shortcuts.py
index f4fa0600ac..b27a75206f 100644
--- a/django/shortcuts.py
+++ b/django/shortcuts.py
@@ -8,7 +8,6 @@ from django.http import (
)
from django.template import loader
from django.urls import NoReverseMatch, reverse
-from django.utils import six
from django.utils.encoding import force_text
from django.utils.functional import Promise
@@ -137,7 +136,7 @@ def resolve_url(to, *args, **kwargs):
# further to some Python functions like urlparse.
to = force_text(to)
- if isinstance(to, six.string_types):
+ if isinstance(to, str):
# Handle relative URLs
if to.startswith(('./', '../')):
return to