From 2092206bee3281e6809a8fddb5230d80902a02b4 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 2 Aug 2018 10:20:24 -0400 Subject: Refs #29600 -- Updated django.utils.datetime_safe now that Python 2 is unsupported. --- django/utils/datetime_safe.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'django/utils') diff --git a/django/utils/datetime_safe.py b/django/utils/datetime_safe.py index ed8420eb8e..7eaa5c21ce 100644 --- a/django/utils/datetime_safe.py +++ b/django/utils/datetime_safe.py @@ -1,11 +1,11 @@ -# Python's datetime strftime doesn't handle dates before 1900. -# These classes override date and datetime to support the formatting of a date -# through its full "proleptic Gregorian" date range. +# These classes override date and datetime to ensure that strftime('%Y') +# returns four digits (with leading zeros) on years < 1000. +# https://bugs.python.org/issue13305 # # Based on code submitted to comp.lang.python by Andrew Dalke # -# >>> datetime_safe.date(1850, 8, 2).strftime("%Y/%m/%d was a %A") -# '1850/08/02 was a Friday' +# >>> datetime_safe.date(10, 8, 2).strftime("%Y/%m/%d was a %A") +# '0010/08/02 was a Monday' import re import time as ttime @@ -71,11 +71,11 @@ def _findall(text, substr): def strftime(dt, fmt): - if dt.year >= 1900: + if dt.year >= 1000: return super(type(dt), dt).strftime(fmt) illegal_formatting = _illegal_formatting.search(fmt) if illegal_formatting: - raise TypeError("strftime of dates before 1900 does not handle" + illegal_formatting.group(0)) + raise TypeError("strftime of dates before 1000 does not handle " + illegal_formatting.group(0)) year = dt.year # For every non-leap year century, advance by -- cgit v1.3