mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Simplified the implementation of timezone.is_aware/naive.

This commit is contained in:
Aymeric Augustin 2015-05-02 14:02:39 +02:00
parent b0bd1f0e19
commit 432678dbc1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/utils/timezone.py
View File

@ -331,20 +331,26 @@ def is_aware(value):
"""
Determines if a given datetime.datetime is aware.
The logic is described in Python's docs:
The concept is defined in Python's docs:
http://docs.python.org/library/datetime.html#datetime.tzinfo
Assuming value.tzinfo is either None or a proper datetime.tzinfo,
value.utcoffset() implements the appropriate logic.
"""
return value.tzinfo is not None and value.tzinfo.utcoffset(value) is not None
return value.utcoffset() is not None
def is_naive(value):
"""
Determines if a given datetime.datetime is naive.
The logic is described in Python's docs:
The concept is defined in Python's docs:
http://docs.python.org/library/datetime.html#datetime.tzinfo
Assuming value.tzinfo is either None or a proper datetime.tzinfo,
value.utcoffset() implements the appropriate logic.
"""
return value.tzinfo is None or value.tzinfo.utcoffset(value) is None
return value.utcoffset() is None
def make_aware(value, timezone=None, is_dst=None):