summaryrefslogtreecommitdiff
path: root/django/utils/timezone.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 14:22:00 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:54 +0200
commit3cb2457f46b3e40ff6b6acffcb3fd44cbea091e5 (patch)
tree68e43a061f1a7a122c02d5c5b39586b32959a9dc /django/utils/timezone.py
parentcacd845996d1245f6aed257bff5f748f46206d3f (diff)
[py3] Replaced basestring by six.string_types.
Diffstat (limited to 'django/utils/timezone.py')
-rw-r--r--django/utils/timezone.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/utils/timezone.py b/django/utils/timezone.py
index d9d9636023..68c214d26f 100644
--- a/django/utils/timezone.py
+++ b/django/utils/timezone.py
@@ -13,6 +13,7 @@ except ImportError:
pytz = None
from django.conf import settings
+from django.utils import six
__all__ = [
'utc', 'get_default_timezone', 'get_current_timezone',
@@ -107,7 +108,7 @@ def get_default_timezone():
"""
global _localtime
if _localtime is None:
- if isinstance(settings.TIME_ZONE, basestring) and pytz is not None:
+ if isinstance(settings.TIME_ZONE, six.string_types) and pytz is not None:
_localtime = pytz.timezone(settings.TIME_ZONE)
else:
_localtime = LocalTimezone()
@@ -160,7 +161,7 @@ def activate(timezone):
"""
if isinstance(timezone, tzinfo):
_active.value = timezone
- elif isinstance(timezone, basestring) and pytz is not None:
+ elif isinstance(timezone, six.string_types) and pytz is not None:
_active.value = pytz.timezone(timezone)
else:
raise ValueError("Invalid timezone: %r" % timezone)