cpython: fd9ce1d4b820 (original) (raw)

Mercurial > cpython

changeset 87226:fd9ce1d4b820

Issue #19634: time.strftime("%y") now raises a ValueError on AIX when given a year before 1900. [#19634]

Victor Stinner victor.stinner@gmail.com
date	Sun, 17 Nov 2013 23:39:21 +0100
parents	00766fa3366b
children	f2fdc675deab
files	Lib/test/test_strftime.py Misc/NEWS Modules/timemodule.c
diffstat	3 files changed, 24 insertions(+), 9 deletions(-)[+] [-] Lib/test/test_strftime.py 16 Misc/NEWS 3 Modules/timemodule.c 14

line wrap: on

line diff

--- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -182,15 +182,13 @@ class Y1900Tests(unittest.TestCase): a date before 1900 is passed with a format string containing "%y" """

@unittest.skipUnless(sys.platform == "win32", "Only applies to Windows")
def test_y_before_1900_win(self):

   with self.assertRaises(ValueError):[](#l1.9)

       time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0))[](#l1.10)

@unittest.skipIf(sys.platform == "win32", "Doesn't apply on Windows")
def test_y_before_1900_nonwin(self):
```
   self.assertEqual([](#l1.14)
```

       time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0)), "99")[](#l1.15)

def test_y_before_1900(self):

   t = (1899, 1, 1, 0, 0, 0, 0, 0, 0)[](#l1.17)

   if sys.platform == "win32" or sys.platform.startswith("aix"):[](#l1.18)

       with self.assertRaises(ValueError):[](#l1.19)

           time.strftime("%y", t)[](#l1.20)

```
   else:[](#l1.21)
```

       self.assertEqual(time.strftime("%y", t), "99")[](#l1.22)

def test_y_1900(self): self.assertEqual(

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -50,6 +50,9 @@ Core and Builtins Library ------- +- Issue #19634: time.strftime("%y") now raises a ValueError on AIX when given a

year before 1900. +

Fix test.support.bind_port() to not cause an error when Python was compiled on a system with SO_REUSEPORT defined in the headers but run on a system with an OS kernel that does not support that reasonably new socket option.

--- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -650,6 +650,20 @@ time_strftime(PyObject *self, PyObject * return NULL; } } +#elif defined(_AIX)

for(outbuf = wcschr(fmt, '%');
```
   outbuf != NULL;[](#l3.9)
```

   outbuf = wcschr(outbuf+2, '%'))[](#l3.10)

{

   /* Issue #19634: On AIX, wcsftime("y", (1899, 1, 1, 0, 0, 0, 0, 0, 0))[](#l3.12)

      returns "0/" instead of "99" */[](#l3.13)

   if (outbuf[1] == L'y' && buf.tm_year < 0) {[](#l3.14)

       PyErr_SetString(PyExc_ValueError,[](#l3.15)

                       "format %y requires year >= 1900 on AIX");[](#l3.16)

```
       Py_DECREF(format);[](#l3.17)
```
```
       return NULL;[](#l3.18)
```
```
   }[](#l3.19)
```
}

#endif fmtlen = time_strlen(fmt);