Ticket #12524: safe_year.2.diff

tests/regressiontests/utils/datetime_safe.py

@@ +1 @@
+"""
+>>> from django.utils import datetime_safe
+
+>>> datetime_safe.date(1850, 8, 2).strftime("%Y/%m/%d was a %A")
+'1850/08/02 was a Friday'
+
+# Pre-1900 dates should be padded with zeros if necessary
+>>> datetime_safe.date(1, 1, 1).strftime("%Y/%m/%d was a %A")
+'0001/01/01 was a Monday'
+"""

tests/regressiontests/utils/tests.py

@@ -9 +9 @@
 
 import timesince
 import datastructures
+import datetime_safe
 import itercompat
 import tzinfo
 
@@ -26 +27 @@
 __test__ = {
     'timesince': timesince,
     'datastructures': datastructures,
+    'datetime_safe': datetime_safe,
     'itercompat': itercompat,
     'tzinfo': tzinfo,
 }

django/utils/datetime_safe.py

@@ -4 +4 @@
 #
 # Based on code submitted to comp.lang.python by Andrew Dalke
 #
-# >>> datetime_safe.date(1850, 8, 2).strftime("%Y/%M/%d was a %A")
+# >>> datetime_safe.date(1850, 8, 2).strftime("%Y/%m/%d was a %A")
 # '1850/08/02 was a Friday'
 
 from datetime import date as real_date, datetime as real_datetime
@@ -83 +83 @@
             sites.append(site)
 
     s = s1
-    syear = "%4d" % (dt.year,)
+    syear = "%04d" % (dt.year,)
     for site in sites:
         s = s[:site] + syear + s[site+4:]
     return s