mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-19 17:00:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #26281 -- Added a helpful error message for an invalid format specifier to dateformat.format().

Browse source
This commit is contained in:
Marko Benko 2016-04-03 19:31:35 +02:00 • committed by Tim Graham
parent b040ac06eb
commit 45c7acdc50
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/utils/dateformat.py
View file

@ -34,6 +34,11 @@ class Formatter(object):
pieces = []
for i, piece in enumerate(re_formatchars.split(force_text(formatstr))):
if i % 2:
if type(self.data) is datetime.date and hasattr(TimeFormat, piece):
raise TypeError(
"The format for date objects may not contain "
"time-related format specifiers (found '%s')." % piece
)
pieces.append(force_text(getattr(self, piece)()))
elif piece:
pieces.append(re_escaped.sub(r'\1', piece))