mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-25 14:14:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[py3] Replaced basestring by six.string_types.

Browse source
This commit is contained in:
Aymeric Augustin 2012-07-20 14:22:00 +02:00
parent cacd845996
commit 3cb2457f46
73 changed files with 230 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/utils/timezone.py
View file

@ -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)