From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 17 Oct 2010 02:07:09 +0000 (+0000)
Subject: find_module(): use FS encoding to display the missing __init__ warning
X-Git-Tag: v3.2a4~508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed7916dd001d5d49b5be04a745c2f83826b27fe2;p=thirdparty%2FPython%2Fcpython.git

find_module(): use FS encoding to display the missing __init__ warning
---

diff --git a/Python/import.c b/Python/import.c
index 6715dc929dab..523a1c04db26 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1736,14 +1736,16 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
                 return &fd_package;
             }
             else {
-                char warnstr[MAXPATHLEN+80];
-                sprintf(warnstr, "Not importing directory "
-                    "'%.*s': missing __init__.py",
-                    MAXPATHLEN, buf);
-                if (PyErr_WarnEx(PyExc_ImportWarning,
-                                 warnstr, 1)) {
+                int err;
+                PyObject *unicode = PyUnicode_DecodeFSDefault(buf);
+                if (unicode == NULL)
+                    return NULL;
+                err = PyErr_WarnFormat(PyExc_ImportWarning, 1,
+                    "Not importing directory '%U': missing __init__.py",
+                    unicode);
+                Py_DECREF(unicode);
+                if (err)
                     return NULL;
-                }
             }
         }
 #endif