Issue #1777412: Remove all limits on tm_year from time.strftime()

The buildbots will tell us which platform does support or not negative years.

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 9f36c9d3e3316c00e48afd3c1c25317e462d2dcd..baabfbbb0aae2275262419930982f3aa4b44d070 100644 (file)
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -294,21 +294,13 @@ class _TestStrftimeYear:
             text = self.yearstr(12345)
         except ValueError:
             # strftime() is limited to [1; 9999] with Visual Studio
-            pass
-        else:
-            # Issue #10864: OpenIndiana is limited to 4 digits, but Python
-            # doesn't raise a ValueError
-            #self.assertEqual(text, '12345')
-            self.assertIn(text, ('2345', '12345'))
-        try:
-            text = self.yearstr(123456789)
-        except ValueError:
-            pass
-        else:
-            # Issue #10864: OpenIndiana is limited to 4 digits, but Python
-            # doesn't raise a ValueError
-            #self.assertEqual(text, '123456789')
-            self.assertIn(text, ('123456789', '6789'))
+            return
+        # Issue #10864: OpenIndiana is limited to 4 digits,
+        # but Python doesn't raise a ValueError
+        #self.assertEqual(text, '12345')
+        #self.assertEqual(self.yearstr(123456789), '123456789')
+        self.assertIn(text, ('2345', '12345'))
+        self.assertIn(self.yearstr(123456789), ('123456789', '6789'))
 
 class _Test2dYear(_BaseYearTest):
     accept2dyear = 1
@@ -336,6 +328,17 @@ class _Test4dYear(_BaseYearTest):
         self.assertIn(self.yearstr(999), ('999', '0999'))
         self.assertEqual(self.yearstr(9999), '9999')
 
+    def test_negative(self):
+        try:
+            text = self.yearstr(-1)
+        except ValueError:
+            # strftime() is limited to [1; 9999] with Visual Studio
+            return
+        self.assertIn(text, ('-1', '-001'))
+
+        self.assertEqual(self.yearstr(-1234), '-1234')
+        self.assertEqual(self.yearstr(-123456), '-123456')
+
 class TestAsctimeAccept2dYear(_TestAsctimeYear, _Test2dYear):
     pass
 
@@ -346,8 +349,7 @@ class TestAsctime4dyear(_TestAsctimeYear, _Test4dYear):
     pass
 
 class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear):
-    def test_bounds(self):
-        self.assertRaises(ValueError, self.yearstr, 0)
+    pass
 
 class Test2dyearBool(_TestAsctimeYear, _Test2dYear):
     accept2dyear = True

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index de1588f0e14380b7e7d25f4e39f2d7c353496ae2..314d8c3a2c29a4735c043224cbeb45988b82975e 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -332,7 +332,7 @@ gettmarg(PyObject *args, struct tm *p)
     if (y < 1000) {
         PyObject *accept = PyDict_GetItemString(moddict,
                                                 "accept2dyear");
-       if (accept != NULL) {
+        if (accept != NULL) {
             int acceptval =  PyObject_IsTrue(accept);
             if (acceptval == -1)
                 return 0;
@@ -481,13 +481,6 @@ time_strftime(PyObject *self, PyObject *args)
                      buf.tm_year + 1900);
         return NULL;
     }
-#else
-    if (buf.tm_year + 1900 < 1) {
-        PyErr_Format(PyExc_ValueError,
-                     "strftime() requires year >= 1",
-                     buf.tm_year + 1900);
-        return NULL;
-    }
 #endif
 
     /* Normalize tm_isdst just in case someone foolishly implements %Z