mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Simplified django.utils.formats.date_format()/time_format() calls.

Browse Source 
This removes redundant get_format() calls and passing a default value
for the format argument.
This commit is contained in:
Nick Pope
2022-10-12 13:23:04 +01:00
committed by Mariusz Felisiak
parent 5cf9ff970e
commit 0fdc5d79b6
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/formats.py
View File

@@ -217,7 +217,7 @@ def localize(value, use_l10n=None):
elif isinstance(value, datetime.date): elif isinstance(value, datetime.date):
return date_format(value, use_l10n=use_l10n) return date_format(value, use_l10n=use_l10n)
elif isinstance(value, datetime.time): elif isinstance(value, datetime.time):
return time_format(value, "TIME_FORMAT", use_l10n=use_l10n) return time_format(value, use_l10n=use_l10n)
return value return value

25
tests/i18n/tests.py
View File

@@ -550,26 +550,13 @@ class FormattingTests(SimpleTestCase):
self.assertIn( self.assertIn(
"23", time_format(some_datetime) "23", time_format(some_datetime)
) # Uses TIME_FORMAT by default ) # Uses TIME_FORMAT by default
self.assertIn("2017", date_format(some_datetime, "DATETIME_FORMAT"))
self.assertIn("2017", date_format(some_date, "YEAR_MONTH_FORMAT"))
self.assertIn("14", date_format(some_date, "MONTH_DAY_FORMAT"))
self.assertIn("2017", date_format(some_date, "SHORT_DATE_FORMAT"))
self.assertIn( self.assertIn(
"2017", "2017",
date_format(some_datetime, format=get_format("DATETIME_FORMAT")), date_format(some_datetime, "SHORT_DATETIME_FORMAT"),
)
self.assertIn(
"2017",
date_format(some_date, format=get_format("YEAR_MONTH_FORMAT")),
)
self.assertIn(
"14", date_format(some_date, format=get_format("MONTH_DAY_FORMAT"))
)
self.assertIn(
"2017",
date_format(some_date, format=get_format("SHORT_DATE_FORMAT")),
)
self.assertIn(
"2017",
date_format(
some_datetime, format=get_format("SHORT_DATETIME_FORMAT")
),
) )
def test_locale_independent(self): def test_locale_independent(self):
@@ -961,7 +948,7 @@ class FormattingTests(SimpleTestCase):
Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt), Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt),
) )
self.assertEqual( self.assertEqual(
date_format(datetime.datetime.now(), "DATE_FORMAT"), date_format(datetime.datetime.now()),
Template('{% now "DATE_FORMAT" %}').render(self.ctxt), Template('{% now "DATE_FORMAT" %}').render(self.ctxt),
) )