mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-20 07:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Closes #11696: Fix ID generation in msilib.

Browse source 
Patch by Mark Mc Mahon.
This commit is contained in:
Martin v. Löwis 2011-03-27 20:58:52 +02:00
parent d687be09b4
commit 03f7e235c8
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/msilib/__init__.py
View file

@ -173,9 +173,8 @@ def add_tables(db, module):
add_data(db, table, getattr(module, table)) add_data(db, table, getattr(module, table))
def make_id(str): def make_id(str):
#str = str.replace(".", "_") # colons are allowed identifier_chars = string.ascii_letters + string.digits + "._"
for c in " -+~;": str = "".join([c if c in identifier_chars else "_" for c in str])
str = str.replace(c, "_")
if str[0] in (string.digits + "."): if str[0] in (string.digits + "."):
str = "_" + str str = "_" + str
assert re.match("^[A-Za-z_][A-Za-z0-9_.]*$", str), "FILE"+str assert re.match("^[A-Za-z_][A-Za-z0-9_.]*$", str), "FILE"+str

1
Misc/ACKS
View file

@ -529,6 +529,7 @@ Chris McDonough
Greg McFarlane Greg McFarlane
Alan McIntyre Alan McIntyre
Michael McLay Michael McLay
Mark Mc Mahon
Gordon McMillan Gordon McMillan
Caolan McNamara Caolan McNamara
Andrew McNamara Andrew McNamara

2
Misc/NEWS
View file

@ -47,6 +47,8 @@ Core and Builtins
Library Library
------- -------
- Issue #11696: Fix ID generation in msilib.
- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when - Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when
trying to pack a negative (in-range) integer. trying to pack a negative (in-range) integer.