diff options
| author | django-bot <ops@djangoproject.com> | 2022-02-03 20:24:19 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-02-07 20:37:05 +0100 |
| commit | 9c19aff7c7561e3a82978a272ecdaad40dda5c00 (patch) | |
| tree | f0506b668a013d0063e5fba3dbf4863b466713ba /django/utils/dateformat.py | |
| parent | f68fa8b45dfac545cfc4111d4e52804c86db68d3 (diff) | |
Refs #33476 -- Reformatted code with Black.
Diffstat (limited to 'django/utils/dateformat.py')
| -rw-r--r-- | django/utils/dateformat.py | 81 |
1 files changed, 43 insertions, 38 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index 70bfb32e01..541b8f8688 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -15,17 +15,24 @@ import datetime from email.utils import format_datetime as format_datetime_rfc5322 from django.utils.dates import ( - MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR, + MONTHS, + MONTHS_3, + MONTHS_ALT, + MONTHS_AP, + WEEKDAYS, + WEEKDAYS_ABBR, ) from django.utils.regex_helper import _lazy_re_compile from django.utils.timezone import ( - _datetime_ambiguous_or_imaginary, get_default_timezone, is_naive, + _datetime_ambiguous_or_imaginary, + get_default_timezone, + is_naive, make_aware, ) from django.utils.translation import gettext as _ -re_formatchars = _lazy_re_compile(r'(?<!\\)([aAbcdDeEfFgGhHiIjlLmMnNoOPrsStTUuwWyYzZ])') -re_escaped = _lazy_re_compile(r'\\(.)') +re_formatchars = _lazy_re_compile(r"(?<!\\)([aAbcdDeEfFgGhHiIjlLmMnNoOPrsStTUuwWyYzZ])") +re_escaped = _lazy_re_compile(r"\\(.)") class Formatter: @@ -40,12 +47,11 @@ class Formatter: ) pieces.append(str(getattr(self, piece)())) elif piece: - pieces.append(re_escaped.sub(r'\1', piece)) - return ''.join(pieces) + pieces.append(re_escaped.sub(r"\1", piece)) + return "".join(pieces) class TimeFormat(Formatter): - def __init__(self, obj): self.data = obj self.timezone = None @@ -61,22 +67,21 @@ class TimeFormat(Formatter): @property def _no_timezone_or_datetime_is_ambiguous_or_imaginary(self): - return ( - not self.timezone or - _datetime_ambiguous_or_imaginary(self.data, self.timezone) + return not self.timezone or _datetime_ambiguous_or_imaginary( + self.data, self.timezone ) def a(self): "'a.m.' or 'p.m.'" if self.data.hour > 11: - return _('p.m.') - return _('a.m.') + return _("p.m.") + return _("a.m.") def A(self): "'AM' or 'PM'" if self.data.hour > 11: - return _('PM') - return _('AM') + return _("PM") + return _("AM") def e(self): """ @@ -88,8 +93,8 @@ class TimeFormat(Formatter): return "" try: - if hasattr(self.data, 'tzinfo') and self.data.tzinfo: - return self.data.tzname() or '' + if hasattr(self.data, "tzinfo") and self.data.tzinfo: + return self.data.tzname() or "" except NotImplementedError: pass return "" @@ -103,7 +108,7 @@ class TimeFormat(Formatter): """ hour = self.data.hour % 12 or 12 minute = self.data.minute - return '%d:%02d' % (hour, minute) if minute else hour + return "%d:%02d" % (hour, minute) if minute else hour def g(self): "Hour, 12-hour format without leading zeros; i.e. '1' to '12'" @@ -115,15 +120,15 @@ class TimeFormat(Formatter): def h(self): "Hour, 12-hour format; i.e. '01' to '12'" - return '%02d' % (self.data.hour % 12 or 12) + return "%02d" % (self.data.hour % 12 or 12) def H(self): "Hour, 24-hour format; i.e. '00' to '23'" - return '%02d' % self.data.hour + return "%02d" % self.data.hour def i(self): "Minutes; i.e. '00' to '59'" - return '%02d' % self.data.minute + return "%02d" % self.data.minute def O(self): # NOQA: E743, E741 """ @@ -135,7 +140,7 @@ class TimeFormat(Formatter): return "" seconds = self.Z() - sign = '-' if seconds < 0 else '+' + sign = "-" if seconds < 0 else "+" seconds = abs(seconds) return "%s%02d%02d" % (sign, seconds // 3600, (seconds // 60) % 60) @@ -147,14 +152,14 @@ class TimeFormat(Formatter): Proprietary extension. """ if self.data.minute == 0 and self.data.hour == 0: - return _('midnight') + return _("midnight") if self.data.minute == 0 and self.data.hour == 12: - return _('noon') - return '%s %s' % (self.f(), self.a()) + return _("noon") + return "%s %s" % (self.f(), self.a()) def s(self): "Seconds; i.e. '00' to '59'" - return '%02d' % self.data.second + return "%02d" % self.data.second def T(self): """ @@ -169,7 +174,7 @@ class TimeFormat(Formatter): def u(self): "Microseconds; i.e. '000000' to '999999'" - return '%06d' % self.data.microsecond + return "%06d" % self.data.microsecond def Z(self): """ @@ -205,7 +210,7 @@ class DateFormat(TimeFormat): def d(self): "Day of the month, 2 digits with leading zeros; i.e. '01' to '31'" - return '%02d' % self.data.day + return "%02d" % self.data.day def D(self): "Day of the week, textual, 3 letters; e.g. 'Fri'" @@ -222,8 +227,8 @@ class DateFormat(TimeFormat): def I(self): # NOQA: E743, E741 "'1' if daylight saving time, '0' otherwise." if self._no_timezone_or_datetime_is_ambiguous_or_imaginary: - return '' - return '1' if self.timezone.dst(self.data) else '0' + return "" + return "1" if self.timezone.dst(self.data) else "0" def j(self): "Day of the month without leading zeros; i.e. '1' to '31'" @@ -239,7 +244,7 @@ class DateFormat(TimeFormat): def m(self): "Month; i.e. '01' to '12'" - return '%02d' % self.data.month + return "%02d" % self.data.month def M(self): "Month, textual, 3 letters; e.g. 'Jan'" @@ -273,19 +278,19 @@ class DateFormat(TimeFormat): def S(self): "English ordinal suffix for the day of the month, 2 characters; i.e. 'st', 'nd', 'rd' or 'th'" if self.data.day in (11, 12, 13): # Special case - return 'th' + return "th" last = self.data.day % 10 if last == 1: - return 'st' + return "st" if last == 2: - return 'nd' + return "nd" if last == 3: - return 'rd' - return 'th' + return "rd" + return "th" def t(self): "Number of days in the given month; i.e. '28' to '31'" - return '%02d' % calendar.monthrange(self.data.year, self.data.month)[1] + return "%02d" % calendar.monthrange(self.data.year, self.data.month)[1] def U(self): "Seconds since the Unix epoch (January 1 1970 00:00:00 GMT)" @@ -304,11 +309,11 @@ class DateFormat(TimeFormat): def y(self): """Year, 2 digits with leading zeros; e.g. '99'.""" - return '%02d' % (self.data.year % 100) + return "%02d" % (self.data.year % 100) def Y(self): """Year, 4 digits with leading zeros; e.g. '1999'.""" - return '%04d' % self.data.year + return "%04d" % self.data.year def z(self): """Day of the year, i.e. 1 to 366.""" |
