summaryrefslogtreecommitdiffstats
path: root/Lib/msilib
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-03-27 19:05:51 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2011-03-27 19:05:51 (GMT)
commitf8d887e0d36afb48381b6e47aba53b9bb54c3b89 (patch)
tree87c0379eb97eb3af10f196aa9d33d15274435b39 /Lib/msilib
parent92b60d55d9115af9661618d7d24da929f181be68 (diff)
downloadcpython-f8d887e0d36afb48381b6e47aba53b9bb54c3b89.zip
cpython-f8d887e0d36afb48381b6e47aba53b9bb54c3b89.tar.gz
cpython-f8d887e0d36afb48381b6e47aba53b9bb54c3b89.tar.bz2
Closes #11696: Fix ID generation in msilib.
Patch by Mark Mc Mahon.
Diffstat (limited to 'Lib/msilib')
-rw-r--r--Lib/msilib/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
index ce4365f..dbdb325 100644
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -173,9 +173,8 @@ def add_tables(db, module):
add_data(db, table, getattr(module, table))
def make_id(str):
- #str = str.replace(".", "_") # colons are allowed
- for c in " -+~;":
- str = str.replace(c, "_")
+ identifier_chars = string.ascii_letters + string.digits + "._"
+ str = "".join([c if c in identifier_chars else "_" for c in str])
if str[0] in (string.digits + "."):
str = "_" + str
assert re.match("^[A-Za-z_][A-Za-z0-9_.]*$", str), "FILE"+str