commit 25bb0fdb67d03a47ee2193219fa0af2f191d4568
author Victor Stinner <victor.stinner@haypocalc.com> Thu Jun 17 23:23:37 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Thu Jun 17 23:23:37 2010 +0000
tree be67ba53efbffa6755a1dce8ec340a0bba2f9453
parent 9b16326e5d0a640bc78bbc357edb1f6455fd9a6b

Merged revisions 82059,82061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82059 | victor.stinner | 2010-06-18 01:08:50 +0200 (ven., 18 juin 2010) | 5 lines

  Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
  Fix the encoding of the modules filename.

  Reindent also traceback.h, just because I hate tabs :-)
........
  r82061 | victor.stinner | 2010-06-18 01:17:37 +0200 (ven., 18 juin 2010) | 2 lines

  Issue #6543: Mention the author of the patch, Amaury Forgeot d'Arc
........

Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index 074b131..05469f8 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4046,7 +4046,7 @@
     freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_Size(cellvars));
     if (!freevars)
         goto error;
-    filename = PyUnicode_DecodeFSDefault(c->c_filename);
+    filename = PyUnicode_FromString(c->c_filename);
     if (!filename)
         goto error;