From fbdd4e7783b8a4b6e637bac2b392024b0e880622 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sun, 14 Apr 2024 10:18:03 -0700 Subject: [PATCH 1/2] gnulib-tool.py: Don't perform newline conversions. * pygnulib/constants.py (nlconvert): Remove function. Remove unused platform import. * pygnulib/GLImport.py (GLImport.gnulib_cache): Remove calls to nlconvert(). * pygnulib/GLModuleSystem.py (GLModule.getAutomakeSnippet_Unconditional): Likewise. * pygnulib/GLTestDir.py (GLTestDir.execute, GLMegaTestDir.execute): Likewise. --- ChangeLog | 12 ++++++++++++ pygnulib/GLImport.py | 2 +- pygnulib/GLModuleSystem.py | 1 - pygnulib/GLTestDir.py | 6 ------ pygnulib/constants.py | 10 ---------- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b40f3d9d8..b5c16eae4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-04-14 Collin Funk + + gnulib-tool.py: Don't perform newline conversions. + * pygnulib/constants.py (nlconvert): Remove function. Remove unused + platform import. + * pygnulib/GLImport.py (GLImport.gnulib_cache): Remove calls to + nlconvert(). + * pygnulib/GLModuleSystem.py + (GLModule.getAutomakeSnippet_Unconditional): Likewise. + * pygnulib/GLTestDir.py (GLTestDir.execute, GLMegaTestDir.execute): + Likewise. + 2024-04-14 Collin Funk gnulib-tool.py: Remove some unused variables. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index eadf45828d..eaff520fa4 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -598,7 +598,7 @@ def gnulib_cache(self) -> str: if vc_files != None: # Convert Python bools to shell (True -> true). emit += 'gl_VC_FILES([%s])\n' % str(vc_files).lower() - return constants.nlconvert(emit) + return emit def gnulib_comp(self, filetable: dict[str, list[str]], gentests: bool) -> str: '''Emit the contents of generated $m4base/gnulib-comp.m4 file. diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 2551e316e1..11cd6ef78a 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -645,7 +645,6 @@ def getAutomakeSnippet_Unconditional(self) -> str: for filename in buildaux_files.split(constants.NL) ] result += 'EXTRA_DIST += %s' % ' '.join(buildaux_files) result += '\n\n' - result = constants.nlconvert(result) self.cache['makefile-unconditional'] = result return self.cache['makefile-unconditional'] diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index dc70e8d304..a7709a1259 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -404,7 +404,6 @@ def execute(self) -> None: if file.startswith('m4/'): file = constants.substart('m4/', '', file) emit += 'EXTRA_DIST += %s\n' % file - emit = constants.nlconvert(emit) with open(destfile, mode='w', newline='\n', encoding='utf-8') as file: file.write(emit) @@ -522,7 +521,6 @@ def execute(self) -> None: emit += 'AH_TOP([#include \"../config.h\"])\n\n' emit += 'AC_CONFIG_FILES([Makefile])\n' emit += 'AC_OUTPUT\n' - emit = constants.nlconvert(emit) path = joinpath(self.testdir, testsbase, 'configure.ac') with open(path, mode='w', newline='\n', encoding='utf-8') as file: file.write(emit) @@ -539,7 +537,6 @@ def execute(self) -> None: emit += 'AUTOMAKE_OPTIONS = 1.14 foreign\n\n' emit += 'SUBDIRS = %s\n\n' % ' '.join(subdirs) emit += 'ACLOCAL_AMFLAGS = -I %s\n' % m4base - emit = constants.nlconvert(emit) path = joinpath(self.testdir, 'Makefile.am') with open(path, mode='w', newline='\n', encoding='utf-8') as file: file.write(emit) @@ -989,7 +986,6 @@ def execute(self) -> None: emit += ' ) 2>&1 | { if test -n "$AUTOBUILD_SUBST"; then ' emit += 'sed -e "$AUTOBUILD_SUBST"; else cat; fi; } > logs/$safemodule\n' emit += 'done\n' - emit = constants.nlconvert(emit) path = joinpath(self.megatestdir, 'do-autobuild') with open(path, mode='w', newline='\n', encoding='utf-8') as file: file.write(emit) @@ -999,7 +995,6 @@ def execute(self) -> None: emit += 'AUTOMAKE_OPTIONS = 1.14 foreign\n\n' emit += 'SUBDIRS = %s\n\n' % ' '.join(megasubdirs) emit += 'EXTRA_DIST = do-autobuild\n' - emit = constants.nlconvert(emit) path = joinpath(self.megatestdir, 'Makefile.am') with open(path, mode='w', newline='\n', encoding='utf-8') as file: file.write(emit) @@ -1014,7 +1009,6 @@ def execute(self) -> None: emit += 'AC_CONFIG_SUBDIRS([%s])\n' % ' '.join(megasubdirs) emit += 'AC_CONFIG_FILES([Makefile])\n' emit += 'AC_OUTPUT\n' - emit = constants.nlconvert(emit) path = joinpath(self.megatestdir, 'configure.ac') with open(path, mode='w', newline='\n', encoding='utf-8') as file: file.write(emit) diff --git a/pygnulib/constants.py b/pygnulib/constants.py index 70381164be..2eedad40eb 100644 --- a/pygnulib/constants.py +++ b/pygnulib/constants.py @@ -25,7 +25,6 @@ import os import sys import stat -import platform import shutil import tempfile import subprocess as sp @@ -522,15 +521,6 @@ def subend(orig: str, repl: str, data: str) -> str: return result -def nlconvert(text: str) -> str: - '''Convert line-endings to specific for this platform.''' - system = platform.system().lower() - text = text.replace('\r\n', '\n') - if system == 'windows': - text = text.replace('\n', '\r\n') - return text - - def remove_trailing_slashes(text: str) -> str: '''Remove trailing slashes from a file name, except when the file name consists only of slashes.''' -- 2.44.0