Skip to content

C
cpython
Kaydet (Commit) 03f7e235 authored tarafından Martin v. Löwis's avatar Martin v. Löwis
Dosyalara gözat
Seçenekler

Closes #11696: Fix ID generation in msilib. 

Patch by Mark Mc Mahon.
üst d687be09
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
Lib/msilib/__init__.py
Dosyayı görüntüle @ 03f7e235
...@@ -173,9 +173,8 @@ def add_tables(db, module): ...@@ -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
......
Misc/ACKS
Dosyayı görüntüle @ 03f7e235
...@@ -529,6 +529,7 @@ Chris McDonough ...@@ -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
......
Misc/NEWS
Dosyayı görüntüle @ 03f7e235
...@@ -47,6 +47,8 @@ Core and Builtins ...@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment