mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 12:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge 2.7.2 release branch

Browse source
This commit is contained in:
Benjamin Peterson 2011-06-05 12:51:18 -05:00
commit 1dc4a828e9
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/msi/msi.py
View file

@ -1022,8 +1022,6 @@ def add_files(db):
lib.add_file("zipdir.zip") lib.add_file("zipdir.zip")
if dir=='tests' and parent.physical=='distutils': if dir=='tests' and parent.physical=='distutils':
lib.add_file("Setup.sample") lib.add_file("Setup.sample")
if dir=='cjkencodings':
lib.glob("*.txt")
if dir=='decimaltestdata': if dir=='decimaltestdata':
lib.glob("*.decTest") lib.glob("*.decTest")
if dir=='xmltestdata': if dir=='xmltestdata':

2
Tools/msi/uuids.py
View file

@ -53,4 +53,6 @@ product_codes = {
'2.7.1121':'{60a4036a-374c-4fd2-84b9-bfae7db03931}', # 2.7.1rc1 '2.7.1121':'{60a4036a-374c-4fd2-84b9-bfae7db03931}', # 2.7.1rc1
'2.7.1122':'{5965e7d1-5584-4de9-b13a-694e0b2ee3a6}', # 2.7.1rc2 '2.7.1122':'{5965e7d1-5584-4de9-b13a-694e0b2ee3a6}', # 2.7.1rc2
'2.7.1150':'{32939827-d8e5-470a-b126-870db3c69fdf}', # 2.7.1 '2.7.1150':'{32939827-d8e5-470a-b126-870db3c69fdf}', # 2.7.1
'2.7.2121':'{B2E1F06E-F719-4786-972A-488A336EB2A0}', # 2.7.2rc1
'2.7.2150':'{2E295B5B-1AD4-4d36-97C2-A316084722CF}', # 2.7.2
} }