>From a68f103cc3863310e1c1b4dd9e05b7924381d9a1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 7 Aug 2022 13:11:07 +0200 Subject: [PATCH 05/19] gnulib-tool.py: Make regex uses more straightforward. * pygnulib/GLEmiter.py: Don't use flag re.S on regular expressions on regular expressions with no '.'. * pygnulib/GLImport.py: Likewise. --- ChangeLog | 7 +++++++ pygnulib/GLEmiter.py | 4 ++-- pygnulib/GLImport.py | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5396f935a3..bcaedf98e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2022-08-07 Bruno Haible + + gnulib-tool.py: Make regex uses more straightforward. + * pygnulib/GLEmiter.py: Don't use flag re.S on regular expressions on + regular expressions with no '.'. + * pygnulib/GLImport.py: Likewise. + 2022-08-06 Bruno Haible gnulib-tool: In the VC files messages, omit the destination directory. diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index b6c31fa603..f85ef30d52 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -750,7 +750,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # * https://debbugs.gnu.org/10997 # * https://debbugs.gnu.org/11030 # So we need this workaround. - pattern = re.compile('^pkgdata_DATA *\\+=', re.S | re.M) + pattern = re.compile('^pkgdata_DATA *\\+=', re.M) if pattern.findall(allsnippets): emit += 'pkgdata_DATA =\n' emit += 'EXTRA_DIST =\n' @@ -1032,7 +1032,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # * https://debbugs.gnu.org/10997 # * https://debbugs.gnu.org/11030 # So we need this workaround. - pattern = re.compile('^pkgdata_DATA *\\+=', re.S | re.M) + pattern = re.compile('^pkgdata_DATA *\\+=', re.M) if bool(pattern.findall(main_snippets)) or bool(pattern.findall(longrun_snippets)): emit += 'pkgdata_DATA =\n' diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index 935a662593..7a6312ec39 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -100,7 +100,7 @@ class GLImport(object): if match: result = cleaner(match)[0] self.cache.setAuxDir(joinpath(self.config['destdir'], result)) - pattern = re.compile(r'A[CM]_PROG_LIBTOOL', re.S | re.M) + pattern = re.compile(r'A[CM]_PROG_LIBTOOL', re.M) guessed_libtool = bool(pattern.findall(data)) if self.config['auxdir'] == None: self.config.setAuxDir(self.cache['auxdir']) @@ -1439,9 +1439,9 @@ in _a_LDFLAGS or _la_LDFLAGS when linking a library.''') with codecs.open(configure_ac, 'rb', 'UTF-8') as file: data = file.read() match_result1 = \ - bool(re.compile('^ *AC_PROG_CC_STDC', re.S | re.M).findall(data)) + bool(re.compile('^ *AC_PROG_CC_STDC', re.M).findall(data)) match_result2 = \ - bool(re.compile('^ *AC_PROG_CC_C99', re.S | re.M).findall(data)) + bool(re.compile('^ *AC_PROG_CC_C99', re.M).findall(data)) if match_result1: position_early_after = 'AC_PROG_CC_STDC' elif match_result2: -- 2.34.1