Merge from 3.1

This commit is contained in:
Senthil Kumaran 2011-04-06 14:11:09 +08:00
commit ae664fb528
2 changed files with 9 additions and 1 deletions

View file

@ -512,7 +512,7 @@ time_strftime(PyObject *self, PyObject *args)
if (outbuf[1]=='#')
++outbuf; /* not documented by python, */
if (outbuf[1]=='\0' ||
!wcschr(L"aAbBcdfHIjmMpSUwWxXyYzZ%", outbuf[1]))
!wcschr(L"aAbBcdHIjmMpSUwWxXyYzZ%", outbuf[1]))
{
PyErr_SetString(PyExc_ValueError, "Invalid format string");
return 0;