Merge with 3.5

This commit is contained in:
Steve Dower 2015-09-22 17:01:17 -07:00
commit 8ef1db34bb
11 changed files with 190 additions and 87 deletions

View file

@ -653,6 +653,9 @@ time_strftime(PyObject *self, PyObject *args)
PyErr_NoMemory();
break;
}
#if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__)
errno = 0;
#endif
_Py_BEGIN_SUPPRESS_IPH
buflen = format_time(outbuf, i, fmt, &buf);
_Py_END_SUPPRESS_IPH