[Python-checkins] cpython (3.4): Backed out changeset: a29b49d57769

steve.dower python-checkins at python.org
Sun Sep 6 08:14:42 CEST 2015


https://hg.python.org/cpython/rev/f15c5b0f51a4
changeset:   97698:f15c5b0f51a4
branch:      3.4
parent:      97694:a29b49d57769
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Sep 05 23:09:00 2015 -0700
summary:
  Backed out changeset: a29b49d57769

files:
  Misc/NEWS            |  2 --
  Modules/timemodule.c |  6 ------
  2 files changed, 0 insertions(+), 8 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,8 +84,6 @@
 - Issue #16180: Exit pdb if file has syntax error, instead of trapping user
   in an infinite loop.  Patch by Xavier de Gaye.
 
-- Issue #24917: time_strftime() Buffer Over-read. Patch by John Leitch.
-
 - Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
   Patch from Berker Peksag.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -662,12 +662,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


More information about the Python-checkins mailing list