Commit 78c47d4a authored by Stefan Behnel's avatar Stefan Behnel

minor code cleanup

parent 3c82deac
...@@ -152,16 +152,16 @@ class UtilityCodeBase(object): ...@@ -152,16 +152,16 @@ class UtilityCodeBase(object):
_, ext = os.path.splitext(path) _, ext = os.path.splitext(path)
if ext in ('.pyx', '.py', '.pxd', '.pxi'): if ext in ('.pyx', '.py', '.pxd', '.pxi'):
comment = '#' comment = '#'
replace_comments = re.compile(r'^\s*#.*').sub strip_comments = partial(re.compile(r'^\s*#.*').sub, '')
rstrip = unicode.rstrip rstrip = unicode.rstrip
else: else:
comment = '/' comment = '/'
replace_comments = re.compile(r'^\s*//.*|/\*[^*]*\*/').sub strip_comments = partial(re.compile(r'^\s*//.*|/\*[^*]*\*/').sub, '')
rstrip = partial(re.compile(r'\s*(\\?)$').sub, r'\1') rstrip = partial(re.compile(r'\s*(\\?)$').sub, r'\1')
match_special = re.compile( match_special = re.compile(
(r'^%(C)s{5,30}\s*(?P<name>(?:\w|\.)+)\s*%(C)s{5,30}|' (r'^%(C)s{5,30}\s*(?P<name>(?:\w|\.)+)\s*%(C)s{5,30}|'
r'^%(C)s+@(?P<tag>\w+)\s*:\s*(?P<value>(?:\w|[.:])+)' r'^%(C)s+@(?P<tag>\w+)\s*:\s*(?P<value>(?:\w|[.:])+)') %
) % {'C':comment}).match {'C': comment}).match
match_type = re.compile('(.+)[.](proto|impl|init|cleanup)$').match match_type = re.compile('(.+)[.](proto|impl|init|cleanup)$').match
f = Utils.open_source_file(filename, encoding='UTF-8') f = Utils.open_source_file(filename, encoding='UTF-8')
...@@ -197,7 +197,7 @@ class UtilityCodeBase(object): ...@@ -197,7 +197,7 @@ class UtilityCodeBase(object):
tags.setdefault(m.group('tag'), set()).add(m.group('value')) tags.setdefault(m.group('tag'), set()).add(m.group('value'))
lines.append('') # keep line number correct lines.append('') # keep line number correct
else: else:
lines.append(rstrip(replace_comments('', line))) lines.append(rstrip(strip_comments(line)))
if utility is None: if utility is None:
raise ValueError("Empty utility code file") raise ValueError("Empty utility code file")
......
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