[Python-checkins] cpython (3.5): Backing out 09b62202d9b7; the tests fail on Linux, and it needs a re-think.

Mon Sep 7 07:38:01 CEST 2015

https://hg.python.org/cpython/rev/d27737fe3108
changeset: 97727:d27737fe3108
branch: 3.5
user: Larry Hastings <larry at hastings.org>
date: Sun Sep 06 00:31:02 2015 -0700
summary:
 Backing out 09b62202d9b7; the tests fail on Linux, and it needs a re-think.
files:
 Lib/test/test_time.py | 6 ------
 Misc/NEWS | 2 --
 Modules/timemodule.c | 12 ------------
 3 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -174,12 +174,6 @@
 def test_strftime_bounding_check(self):
 self._bounds_checking(lambda tup: time.strftime('', tup))
 
- def test_strftime_format_check(self):
- for x in [ '', 'A', '%A', '%AA' ]:
- for y in range(0x0, 0x10):
- for z in [ '%', 'A%', 'AA%', '%A%', 'A%A%', '%#' ]:
- self.assertRaises(ValueError, time.strftime, x * y + z)
-
 def test_default_values_for_zero(self):
 # Make sure that using all zeros uses the proper default
 # values. No test for daylight savings since strftime() does
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,8 +22,6 @@
 to support Python modules replacing themselves with extension modules.
 Patch by Petr Viktorin.
 
-- Issue #24917: time_strftime() Buffer Over-read. Patch by John Leitch.
-
 - Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
 would return True once, then False on subsequent calls.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -623,12 +623,6 @@
 Py_DECREF(format);
 return NULL;
 }
- else if (outbuf[1] == '0円')
- {
- PyErr_SetString(PyExc_ValueError, "Incomplete format string");
- Py_DECREF(format);
- return NULL;
- }
 }
 #elif (defined(_AIX) || defined(sun)) && defined(HAVE_WCSFTIME)
 for(outbuf = wcschr(fmt, '%');
@@ -642,12 +636,6 @@
 "format %y requires year >= 1900 on AIX");
 return NULL;
 }
- else if (outbuf[1] == '0円')
- {
- PyErr_SetString(PyExc_ValueError, "Incomplete format string");
- Py_DECREF(format);
- return NULL;
- }
 }
 #endif
 
-- 
Repository URL: https://hg.python.org/cpython
