diff options
Diffstat (limited to 'Tools/freeze/parsesetup.py')
| -rw-r--r-- | Tools/freeze/parsesetup.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Tools/freeze/parsesetup.py b/Tools/freeze/parsesetup.py index 1795671..7f90075 100644 --- a/Tools/freeze/parsesetup.py +++ b/Tools/freeze/parsesetup.py @@ -1,6 +1,6 @@ # Parse Makefiles and Python Setup(.in) files. -import regex +import re import string @@ -8,7 +8,7 @@ import string # Return a dictionary mapping names to values. # May raise IOError. -makevardef = regex.compile('^\([a-zA-Z0-9_]+\)[ \t]*=\(.*\)') +makevardef = re.compile('^([a-zA-Z0-9_]+)[ \t]*=(.*)') def getmakevars(filename): variables = {} @@ -18,9 +18,10 @@ def getmakevars(filename): line = fp.readline() if not line: break - if makevardef.match(line) < 0: + matchobj = makevardef.match(line) + if not matchobj: continue - name, value = makevardef.group(1, 2) + (name, value) = matchobj.group(1, 2) # Strip trailing comment i = string.find(value, '#') if i >= 0: @@ -37,7 +38,7 @@ def getmakevars(filename): # definitions, the second mapping variable names to their values. # May raise IOError. -setupvardef = regex.compile('^\([a-zA-Z0-9_]+\)=\(.*\)') +setupvardef = re.compile('^([a-zA-Z0-9_]+)=(.*)') def getsetupinfo(filename): modules = {} @@ -52,8 +53,9 @@ def getsetupinfo(filename): i = string.find(line, '#') if i >= 0: line = line[:i] - if setupvardef.match(line) >= 0: - name, value = setupvardef.group(1, 2) + matchobj = setupvardef.match(line) + if matchobj: + (name, value) = matchobj.group(1, 2) variables[name] = string.strip(value) else: words = string.split(line) |