From 279bd8ac9a2fa6a617ba11ffd5f8be0ff40bb03d Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sun, 14 Apr 2024 10:31:34 -0700 Subject: [PATCH 2/2] gnulib-tool.py: Write newlines consistently. * pygnulib/constants.py (NL): Remove variable. * pygnulib/GLImport.py (GLImport.gnulib_comp): Use '\n' instead of constants.NL. * pygnulib/GLModuleSystem.py (GLModule.getAutomakeSnippet_Unconditional): Likewise. * pygnulib/main.py (main_with_exception_handling): Likewise. --- ChangeLog | 10 ++++++++++ pygnulib/GLImport.py | 2 +- pygnulib/GLModuleSystem.py | 18 +++++++++--------- pygnulib/constants.py | 2 -- pygnulib/main.py | 4 ++-- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5c16eae4e..80e361f04f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2024-04-14 Collin Funk + + gnulib-tool.py: Write newlines consistently. + * pygnulib/constants.py (NL): Remove variable. + * pygnulib/GLImport.py (GLImport.gnulib_comp): Use '\n' instead of + constants.NL. + * pygnulib/GLModuleSystem.py + (GLModule.getAutomakeSnippet_Unconditional): Likewise. + * pygnulib/main.py (main_with_exception_handling): Likewise. + 2024-04-14 Collin Funk gnulib-tool.py: Don't perform newline conversions. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index eaff520fa4..c6a4693c90 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -649,7 +649,7 @@ def gnulib_comp(self, filetable: dict[str, list[str]], gentests: bool) -> str: emit += ' # Code from module %s:\n' % str(module) snippet = module.getAutoconfEarlySnippet() lines = [ line - for line in snippet.split(constants.NL) + for line in snippet.split('\n') if line != '' ] if lines: emit += ' %s\n' % '\n '.join(lines) diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 11cd6ef78a..82b3c2f6e5 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -592,11 +592,11 @@ def getAutomakeSnippet_Unconditional(self) -> str: # *-tests module live in tests/, not lib/. # Synthesize an EXTRA_DIST augmentation. files = self.getFiles() - extra_files = filter_filelist(constants.NL, files, + extra_files = filter_filelist('\n', files, 'tests/', '', 'tests/', '') if extra_files != '': - result += 'EXTRA_DIST += %s' % ' '.join(extra_files.split(constants.NL)) - result += constants.NL * 2 + result += 'EXTRA_DIST += %s' % ' '.join(extra_files.split('\n')) + result += '\n' * 2 else: # if not tests module # Synthesize an EXTRA_DIST augmentation. snippet = self.getAutomakeSnippet_Conditional() @@ -609,10 +609,10 @@ def getAutomakeSnippet_Unconditional(self) -> str: for line in mentioned_files for filename in line.split() } all_files = self.getFiles() - lib_files = filter_filelist(constants.NL, all_files, + lib_files = filter_filelist('\n', all_files, 'lib/', '', 'lib/', '') if lib_files != '': - lib_files = set(lib_files.split(constants.NL)) + lib_files = set(lib_files.split('\n')) else: lib_files = set() # Remove mentioned_files from lib_files. @@ -632,17 +632,17 @@ def getAutomakeSnippet_Unconditional(self) -> str: # a .c file is preprocessed into another .c file for BUILT_SOURCES -, # automake will generate a useless dependency; this is harmless. if str(self) != 'relocatable-prog-wrapper' and str(self) != 'pt_chown': - extra_files = filter_filelist(constants.NL, extra_files, + extra_files = filter_filelist('\n', extra_files, '', '.c', '', '') if extra_files != '': - result += 'EXTRA_lib_SOURCES += %s' % ' '.join(extra_files.split(constants.NL)) + result += 'EXTRA_lib_SOURCES += %s' % ' '.join(extra_files.split('\n')) result += '\n\n' # Synthesize an EXTRA_DIST augmentation also for the files in build-aux - buildaux_files = filter_filelist(constants.NL, all_files, + buildaux_files = filter_filelist('\n', all_files, 'build-aux/', '', 'build-aux/', '') if buildaux_files != '': buildaux_files = [ os.path.join('$(top_srcdir)', joinpath(auxdir, filename)) - for filename in buildaux_files.split(constants.NL) ] + for filename in buildaux_files.split('\n') ] result += 'EXTRA_DIST += %s' % ' '.join(buildaux_files) result += '\n\n' self.cache['makefile-unconditional'] = result diff --git a/pygnulib/constants.py b/pygnulib/constants.py index 2eedad40eb..899ba46efd 100644 --- a/pygnulib/constants.py +++ b/pygnulib/constants.py @@ -55,8 +55,6 @@ ENCS = dict() # Encodings MODES = dict() # Modes TESTS = dict() # Tests -NL = ''' -''' # Newline character # Set ENCS dictionary if not hasattr(interpreter, '__file__'): diff --git a/pygnulib/main.py b/pygnulib/main.py index b24db139b5..fd39cf07a6 100644 --- a/pygnulib/main.py +++ b/pygnulib/main.py @@ -1414,11 +1414,11 @@ def main_with_exception_handling() -> None: message += 'missing --lib option' elif errno == 11: incompatibilities = '' - message += 'incompatible license on modules:%s' % constants.NL + message += 'incompatible license on modules:\n' for pair in errinfo: incompatibilities += pair[0] incompatibilities += ' %s' % pair[1] - incompatibilities += constants.NL + incompatibilities += '\n' tempname = mktemp() with open(tempname, mode='w', newline='\n', encoding='utf-8') as file: file.write(incompatibilities) -- 2.44.0