From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 16 Oct 2011 21:45:39 +0000 (+0200)
Subject: Issue #10653: Fix time.strftime() on Windows, check for invalid format strings
X-Git-Tag: v3.2.3rc1~502
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d91d454d5adf26eb0eacbaddb834f20238bb793;p=thirdparty%2FPython%2Fcpython.git

Issue #10653: Fix time.strftime() on Windows, check for invalid format strings
---

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 34e4875a2990..bc908c07f96e 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -508,16 +508,16 @@ time_strftime(PyObject *self, PyObject *args)
     fmt = PyBytes_AS_STRING(format);
 #endif
 
-#if defined(MS_WINDOWS) && defined(HAVE_WCSFTIME)
+#if defined(MS_WINDOWS)
     /* check that the format string contains only valid directives */
-    for(outbuf = wcschr(fmt, L'%');
+    for(outbuf = strchr(fmt, '%');
         outbuf != NULL;
-        outbuf = wcschr(outbuf+2, L'%'))
+        outbuf = strchr(outbuf+2, '%'))
     {
         if (outbuf[1]=='#')
             ++outbuf; /* not documented by python, */
         if (outbuf[1]=='\0' ||
-            !wcschr(L"aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
+            !strchr("aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
         {
             PyErr_SetString(PyExc_ValueError, "Invalid format string");
             return 0;