diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-08-07 13:29:59 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-08-07 23:04:07 +0200 |
| commit | 54bf87fe01941049356177a1902bdf1a3eb49f7f (patch) | |
| tree | c0290602654a9d3416ead0b0e3d441a7f060cc78 /pygnulib/GLModuleSystem.py | |
| parent | a68f103cc3863310e1c1b4dd9e05b7924381d9a1 (diff) | |
| download | gnulib-54bf87fe01941049356177a1902bdf1a3eb49f7f.tar.gz | |
gnulib-tool.py: Make regex uses more straightforward.
* pygnulib/GLModuleSystem.py: Don't use flag re.S on regular expressions
that are meant to match a single line only, and remove the use of the
"minimal matching" *? construct whose only purpose was to neutralize the
re.S flag.
* pygnulib/GLEmiter.py: Likewise.
* pygnulib/GLImport.py: Likewise.
* pygnulib/GLTestDir.py: Likewise.
Diffstat (limited to 'pygnulib/GLModuleSystem.py')
| -rw-r--r-- | pygnulib/GLModuleSystem.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 6b8f20e54f..afc7a472cf 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -705,7 +705,7 @@ Include:|Link:|License:|Maintainer:)' # TODO: unconditional automake snippet for nontests modules snippet = self.getAutomakeSnippet_Conditional() snippet = constants.combine_lines(snippet) - pattern = re.compile('^lib_SOURCES[\t ]*\\+=[\t ]*(.*?)$', re.S | re.M) + pattern = re.compile('^lib_SOURCES[\t ]*\\+=[\t ]*(.*)$', re.M) mentioned_files = pattern.findall(snippet) if mentioned_files != list(): mentioned_files = mentioned_files[-1].split(' ') @@ -780,7 +780,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = ''.join(parts) result = result.strip() - pattern = re.compile('^(["<].*?[>"])', re.S | re.M) + pattern = re.compile('^(["<].*[>"])', re.M) result = pattern.sub('#include \\1', result) self.cache['include'] = result return self.cache['include'] @@ -1164,7 +1164,7 @@ class GLModuleTable(object): raise TypeError('each module must be a GLModule instance') snippet = module.getAutomakeSnippet() snippet = constants.remove_backslash_newline(snippet) - pattern = re.compile('^lib_SOURCES[\t ]*\\+=[\t ]*(.*?)$', re.S | re.M) + pattern = re.compile('^lib_SOURCES[\t ]*\\+=[\t ]*(.*)$', re.M) files = pattern.findall(snippet) if files: # if source files were found files = files[-1].split(' ') |