From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Nov 2011 15:01:27 +0000 (+0100)
Subject: Remove temporary hacks for the issue #13441
X-Git-Tag: v3.3.0a1~771
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce0e7daf4195eda75166757183b06fd2d246e668;p=python

Remove temporary hacks for the issue #13441
---

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 6a751d6187..9bba1b39cf 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -72,20 +72,6 @@ str2uni(const char* s)
     assert(res1 != (size_t)-1);
 #else
     assert(res1 == needed);
-#endif
-#ifdef Py_DEBUG
-    {
-        size_t i;
-        printf("Decode wchar_t {");
-        for (i=0; i<res1; i++) {
-            wchar_t ch = dest[i];
-            if (i)
-                printf(" U+%04x", ch);
-            else
-                printf("U+%04x", ch);
-        }
-        printf("} (len=%u)\n", res1);
-    }
 #endif
     res2 = PyUnicode_FromWideChar(dest, res1);
     if (dest != smallbuf)
@@ -93,23 +79,6 @@ str2uni(const char* s)
     return res2;
 }
 
-#ifdef Py_DEBUG
-void
-dump_str(const char *name, const char *value)
-{
-    size_t i, len = strlen(value);
-    printf("Decode localeconv() %s: {", name);
-    for (i=0; i<len; i++) {
-        unsigned char ch = value[i];
-        if (i)
-            printf(" 0x%02x", ch);
-        else
-            printf("0x%02x", ch);
-    }
-    printf("} (len=%u)\n", len);
-}
-#endif
-
 /* support functions for formatting floating point numbers */
 
 PyDoc_STRVAR(setlocale__doc__,
@@ -174,18 +143,12 @@ PyLocale_setlocale(PyObject* self, PyObject* args)
 
     if (locale) {
         /* set locale */
-#ifdef Py_DEBUG
-        printf("SET LOCALE \"%s\"\n", locale);
-#endif
         result = setlocale(category, locale);
         if (!result) {
             /* operation failed, no setting was changed */
             PyErr_SetString(Error, "unsupported locale setting");
             return NULL;
         }
-#ifdef Py_DEBUG
-        printf("SET LOCALE -> %s\n", result);
-#endif
         result_object = str2uni(result);
         if (!result_object)
             return NULL;
@@ -221,20 +184,11 @@ PyLocale_localeconv(PyObject* self)
     /* hopefully, the localeconv result survives the C library calls
        involved herein */
 
-#ifdef Py_DEBUG
 #define RESULT_STRING(s)\
-    dump_str(#s, l->s); \
     x = str2uni(l->s);   \
     if (!x) goto failed;\
     PyDict_SetItemString(result, #s, x);\
     Py_XDECREF(x)
-#else
-#define RESULT_STRING(s)\
-    x = str2uni(l->s);   \
-    if (!x) goto failed;\
-    PyDict_SetItemString(result, #s, x);\
-    Py_XDECREF(x)
-#endif
 
 #define RESULT_INT(i)\
     x = PyLong_FromLong(l->i);\