#13301: merge with 3.2.

This commit is contained in:
Ezio Melotti 2012-11-09 11:51:03 +01:00
commit 956c6c2dab
2 changed files with 9 additions and 3 deletions

View File

@ -227,6 +227,12 @@ Build
- Issue #15819: Make sure we can build Python out-of-tree from a read-only
source directory. (Somewhat related to issue #9860.)
Tools/Demos
-----------
- Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py
Patch by Serhiy Storchaka.
Documentation
-------------

View File

@ -24,8 +24,9 @@ Options:
Display version information and exit.
"""
import sys
import os
import sys
import ast
import getopt
import struct
import array
@ -180,8 +181,7 @@ def make(filename, outfile):
l = l.strip()
if not l:
continue
# XXX: Does this always follow Python escape semantics?
l = eval(l)
l = ast.literal_eval(l)
if section == ID:
msgid += l.encode(encoding)
elif section == STR: