mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Simplified handling ambiguous/imaginary datetimes in django.utils.dateformat.

Browse Source 
Instead of the separate property, we can just not set self.timezone if
the datetime is ambiguous or imaginary. This ensures that this check
will only ever happen once as it's dependant on the datetime object and
not the format string characters.
This commit is contained in:
Nick Pope 2022-10-12 20:27:20 +01:00 committed by Mariusz Felisiak
parent 65477fd7da
commit 6c86495bce
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
django/utils/dateformat.py
View File

@ -56,20 +56,16 @@ class TimeFormat(Formatter):
self.data = obj self.data = obj
self.timezone = None self.timezone = None
# We only support timezone when formatting datetime objects,
# not date objects (timezone information not appropriate),
# or time objects (against established django policy).
if isinstance(obj, datetime): if isinstance(obj, datetime):
# Timezone is only supported when formatting datetime objects, not
# date objects (timezone information not appropriate), or time
# objects (against established django policy).
if is_naive(obj): if is_naive(obj):
self.timezone = get_default_timezone() timezone = get_default_timezone()
else: else:
self.timezone = obj.tzinfo timezone = obj.tzinfo
if not _datetime_ambiguous_or_imaginary(obj, timezone):
@property self.timezone = timezone
def _no_timezone_or_datetime_is_ambiguous_or_imaginary(self):
return not self.timezone or _datetime_ambiguous_or_imaginary(
self.data, self.timezone
)
def a(self): def a(self):
"'a.m.' or 'p.m.'" "'a.m.' or 'p.m.'"
@ -136,7 +132,7 @@ class TimeFormat(Formatter):
If timezone information is not available, return an empty string. If timezone information is not available, return an empty string.
""" """
if self._no_timezone_or_datetime_is_ambiguous_or_imaginary: if self.timezone is None:
return "" return ""
offset = self.timezone.utcoffset(self.data) offset = self.timezone.utcoffset(self.data)
@ -168,7 +164,7 @@ class TimeFormat(Formatter):
If timezone information is not available, return an empty string. If timezone information is not available, return an empty string.
""" """
if self._no_timezone_or_datetime_is_ambiguous_or_imaginary: if self.timezone is None:
return "" return ""
return str(self.timezone.tzname(self.data)) return str(self.timezone.tzname(self.data))
@ -185,7 +181,7 @@ class TimeFormat(Formatter):
If timezone information is not available, return an empty string. If timezone information is not available, return an empty string.
""" """
if self._no_timezone_or_datetime_is_ambiguous_or_imaginary: if self.timezone is None:
return "" return ""
offset = self.timezone.utcoffset(self.data) offset = self.timezone.utcoffset(self.data)
@ -227,7 +223,7 @@ class DateFormat(TimeFormat):
def I(self): # NOQA: E743, E741 def I(self): # NOQA: E743, E741
"'1' if daylight saving time, '0' otherwise." "'1' if daylight saving time, '0' otherwise."
if self._no_timezone_or_datetime_is_ambiguous_or_imaginary: if self.timezone is None:
return "" return ""
return "1" if self.timezone.dst(self.data) else "0" return "1" if self.timezone.dst(self.data) else "0"