diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-17 23:23:37 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-17 23:23:37 (GMT) |
commit | 25bb0fdb67d03a47ee2193219fa0af2f191d4568 (patch) | |
tree | be67ba53efbffa6755a1dce8ec340a0bba2f9453 /Python/compile.c | |
parent | 9b16326e5d0a640bc78bbc357edb1f6455fd9a6b (diff) | |
download | cpython-25bb0fdb67d03a47ee2193219fa0af2f191d4568.zip cpython-25bb0fdb67d03a47ee2193219fa0af2f191d4568.tar.gz cpython-25bb0fdb67d03a47ee2193219fa0af2f191d4568.tar.bz2 |
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
........
Diffstat (limited to 'Python/compile.c')
-rw-r--r-- | Python/compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ makecode(struct compiler *c, struct assembler *a) 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; |