summaryrefslogtreecommitdiff
path: root/django/templatetags
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/templatetags
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/templatetags')
-rw-r--r--django/templatetags/i18n.py2
-rw-r--r--django/templatetags/tz.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py
index 4a32e628c2..407ce87609 100644
--- a/django/templatetags/i18n.py
+++ b/django/templatetags/i18n.py
@@ -74,7 +74,7 @@ class TranslateNode(Node):
self.asvar = asvar
self.message_context = message_context
self.filter_expression = filter_expression
- if isinstance(self.filter_expression.var, six.string_types):
+ if isinstance(self.filter_expression.var, str):
self.filter_expression.var = Variable("'%s'" %
self.filter_expression.var)
diff --git a/django/templatetags/tz.py b/django/templatetags/tz.py
index 4088ba7eb8..99d391e45d 100644
--- a/django/templatetags/tz.py
+++ b/django/templatetags/tz.py
@@ -3,7 +3,7 @@ from datetime import datetime, tzinfo
import pytz
from django.template import Library, Node, TemplateSyntaxError
-from django.utils import six, timezone
+from django.utils import timezone
register = Library()
@@ -59,7 +59,7 @@ def do_timezone(value, arg):
# Obtain a tzinfo instance
if isinstance(arg, tzinfo):
tz = arg
- elif isinstance(arg, six.string_types):
+ elif isinstance(arg, str):
try:
tz = pytz.timezone(arg)
except pytz.UnknownTimeZoneError: