[Python-checkins] r83244 - python/branches/import_unicode/Python/compile.c

29 Jul 2010

Author: victor.stinner
Date: Fri Jul 30 00:51:21 2010
New Revision: 83244

Log:
compiler_error() uses PyUnicode_DecodeFSDefault()

to decode the filename

Modified:
   python/branches/import_unicode/Python/compile.c

Modified: python/branches/import_unicode/Python/compile.c
==============================================================================

--- python/branches/import_unicode/Python/compile.c	(original)
+++ python/branches/import_unicode/Python/compile.c	Fri Jul 30 00:51:21 2010
@@ -3363,13 +3363,23 @@
 {
     PyObject *loc;
     PyObject *u = NULL, *v = NULL;
+    PyObject *filename;
 
     loc = PyErr_ProgramText(c->c_filename, c->u->u_lineno);
     if (!loc) {
         Py_INCREF(Py_None);
         loc = Py_None;
     }
-    u = Py_BuildValue("(ziOO)", c->c_filename, c->u->u_lineno,
+    if (c->c_filename != NULL) {
+        filename = PyUnicode_DecodeFSDefault(c->c_filename);
+        if (filename == NULL)
+            goto exit;
+    }
+    else {
+        Py_INCREF(Py_None);
+        filename = Py_None;
+    }
+    u = Py_BuildValue("(NiOO)", filename, c->u->u_lineno,
                       Py_None, loc);
     if (!u)
         goto exit;

    