(Merge 3.2) Issue #5905: time.strftime() is now using the locale encoding,

instead of UTF-8, if the wcsftime() function is not available.

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/timemodule.c
index 52aade4bda3815174e75064b158232841dbfeedb,33751fad500a0574041cf46b4cefbd9682c439f8..dff46413e4372dbbfa58304db334aa0d57e83cc7
--- 1/Modules/timemodule.c
--- 2/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@@ -30,12 -43,11 +30,6 @@@
  #endif /* MS_WINDOWS */
  #endif /* !__WATCOMC__ || __QNX__ */
  
- #if defined(HAVE_MBCS)
- #  define TZNAME_ENCODING "mbcs"
- #else
- #  define TZNAME_ENCODING "utf-8"
- #endif
 -#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
 -/* Win32 has better clock replacement; we have our own version below. */
 -#undef HAVE_CLOCK
 -#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
--
  #if defined(PYOS_OS2)
  #define INCL_DOS
  #define INCL_ERRORS