From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 9 Dec 2011 19:21:17 +0000 (+0100)
Subject: (Merge 3.2) Issue #5905: time.strftime() is now using the locale encoding,
X-Git-Tag: v3.3.0a1~653
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db6238964d534a160f2b2d8b2b61e19a3d3dee47;p=thirdparty%2FPython%2Fcpython.git

(Merge 3.2) Issue #5905: time.strftime() is now using the locale encoding,
instead of UTF-8, if the wcsftime() function is not available.
---

db6238964d534a160f2b2d8b2b61e19a3d3dee47
diff --cc Modules/timemodule.c
index 52aade4bda38,33751fad500a..dff46413e437
--- a/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