diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-13 23:24:31 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-13 23:24:31 (GMT) |
| commit | f15351d938e76c4b2a42a638825d67f108685140 (patch) | |
| tree | d75a09f72c251d71a714f948f50392249bf91cd9 /Tools/msi | |
| parent | 9451a1c6ae14cc31ea88eaaf68d5a8f946b82831 (diff) | |
| download | cpython-f15351d938e76c4b2a42a638825d67f108685140.zip cpython-f15351d938e76c4b2a42a638825d67f108685140.tar.gz cpython-f15351d938e76c4b2a42a638825d67f108685140.tar.bz2 | |
Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78838 | florent.xicluna | 2010-03-11 15:36:19 +0100 (jeu, 11 mar 2010) | 2 lines
Issue #6472: The xml.etree package is updated to ElementTree 1.3. The cElementTree module is updated too.
........
r78839 | florent.xicluna | 2010-03-11 16:55:11 +0100 (jeu, 11 mar 2010) | 2 lines
Fix repr of tree Element on windows.
........
r78917 | florent.xicluna | 2010-03-13 12:18:49 +0100 (sam, 13 mar 2010) | 2 lines
Move the xml test data to their own directory.
........
r78919 | florent.xicluna | 2010-03-13 13:41:48 +0100 (sam, 13 mar 2010) | 2 lines
Do not chdir when running test_xml_etree, and enhance the findfile helper.
........
r78934 | florent.xicluna | 2010-03-13 18:56:19 +0100 (sam, 13 mar 2010) | 2 lines
Update some parts of the xml.etree documentation.
........
r78937 | florent.xicluna | 2010-03-13 21:30:15 +0100 (sam, 13 mar 2010) | 3 lines
Add the keyword argument "method=None" to the .write() method and the tostring/tostringlist functions.
Update the function, class and method signatures, according to the new convention.
........
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/msi.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index cd67e99..f32bf39 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -1006,8 +1006,6 @@ def add_files(db): lib.add_file("audiotest.au") lib.add_file("cfgparser.1") lib.add_file("sgml_input.html") - lib.add_file("test.xml") - lib.add_file("test.xml.out") lib.add_file("testtar.tar") lib.add_file("test_difflib_expect.html") lib.add_file("check_soundcard.vbs") @@ -1019,6 +1017,9 @@ def add_files(db): lib.add_file("zipdir.zip") if dir=='decimaltestdata': lib.glob("*.decTest") + if dir=='xmltestdata': + lib.glob("*.xml") + lib.add_file("test.xml.out") if dir=='output': lib.glob("test_*") if dir=='idlelib': |