diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2010-03-21 22:02:42 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2010-03-21 22:02:42 (GMT) |
commit | e96ac3a33a154b454159c903cfcfcac5ed56215e (patch) | |
tree | d1d40adb030bafecaf679f7c9290a56d72254add /Tools | |
parent | 1d6af707cfac6406feb5c82656bb8f313bfcb696 (diff) | |
download | cpython-e96ac3a33a154b454159c903cfcfcac5ed56215e.zip cpython-e96ac3a33a154b454159c903cfcfcac5ed56215e.tar.gz cpython-e96ac3a33a154b454159c903cfcfcac5ed56215e.tar.bz2 |
Merged revisions 78991-78992,78994 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78991 | martin.v.loewis | 2010-03-16 12:03:13 +0100 (Di, 16 Mär 2010) | 9 lines
Merged revisions 78976 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78976 | martin.v.loewis | 2010-03-15 14:00:17 +0100 (Mo, 15 Mär 2010) | 1 line
Issue #6716: Quote -x arguments of compileall in MSI installer.
........
................
r78992 | martin.v.loewis | 2010-03-16 14:19:21 +0100 (Di, 16 Mär 2010) | 2 lines
Issue #6716/2: Backslash-replace error output in compilall.
................
r78994 | martin.v.loewis | 2010-03-16 17:19:47 +0100 (Di, 16 Mär 2010) | 1 line
Issue #6716/3: Exclude 2to3 tests from compileall.
................
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/msi/msi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index cd67e99..027af07 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -403,7 +403,7 @@ def add_ui(db): ("VerdanaRed9", "Verdana", 9, 255, 0), ]) - compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x bad_coding|badsyntax|site-packages|py2_ "[TARGETDIR]Lib"' + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests" "[TARGETDIR]Lib"' lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' # See "CustomAction Table" add_data(db, "CustomAction", [ |