From 447378fd3d0384e7e138ef726721cf657ec75873 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Wed, 3 Apr 2024 02:56:42 -0700 Subject: [PATCH 2/2] gnulib-tool.py: Modernize class declarations to Python 3. * pygnulib/GLConfig.py: Remove the explicit object inheritance from class declarations. This is previously required in Python 2. * pygnulib/GLEmiter.py: Likewise. * pygnulib/GLFileSystem.py: Likewise. * pygnulib/GLImport.py: Likewise. * pygnulib/GLInfo.py: Likewise. * pygnulib/GLMakefileTable.py: Likewise. * pygnulib/GLModuleSystem.py: Likewise. * pygnulib/GLTestDir.py: Likewise. --- ChangeLog | 13 +++++++++++++ pygnulib/GLConfig.py | 2 +- pygnulib/GLEmiter.py | 2 +- pygnulib/GLFileSystem.py | 4 ++-- pygnulib/GLImport.py | 2 +- pygnulib/GLInfo.py | 2 +- pygnulib/GLMakefileTable.py | 2 +- pygnulib/GLModuleSystem.py | 6 +++--- pygnulib/GLTestDir.py | 4 ++-- 9 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 333f7cd0cb..230e9c5925 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2024-04-03 Collin Funk + + gnulib-tool.py: Modernize class declarations to Python 3. + * pygnulib/GLConfig.py: Remove the explicit object inheritance from + class declarations. This is previously required in Python 2. + * pygnulib/GLEmiter.py: Likewise. + * pygnulib/GLFileSystem.py: Likewise. + * pygnulib/GLImport.py: Likewise. + * pygnulib/GLInfo.py: Likewise. + * pygnulib/GLMakefileTable.py: Likewise. + * pygnulib/GLModuleSystem.py: Likewise. + * pygnulib/GLTestDir.py: Likewise. + 2024-04-03 Collin Funk gnulib-tool.py: Ignore pylint 'unidiomatic-typecheck' warnings. diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index 10ec5efd37..8136d9b08c 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -49,7 +49,7 @@ normpath = os.path.normpath #=============================================================================== # Define GLConfig class #=============================================================================== -class GLConfig(object): +class GLConfig: '''This class is used to store intermediate settings for all pygnulib classes. It contains all necessary attributes to setup any other class. By default all attributes are set to empty string, empty list or zero. diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 186d94bb92..cb813b3baa 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -107,7 +107,7 @@ def _eliminate_NMD(snippet: str, automake_subdir: bool) -> str: #=============================================================================== # Define GLEmiter class #=============================================================================== -class GLEmiter(object): +class GLEmiter: '''This class is used to emit the contents of necessary files.''' def __init__(self, config: GLConfig) -> None: diff --git a/pygnulib/GLFileSystem.py b/pygnulib/GLFileSystem.py index cb485cf2e8..a0cddd8903 100644 --- a/pygnulib/GLFileSystem.py +++ b/pygnulib/GLFileSystem.py @@ -55,7 +55,7 @@ islink = os.path.islink #=============================================================================== # Define GLFileSystem class #=============================================================================== -class GLFileSystem(object): +class GLFileSystem: '''GLFileSystem class is used to create virtual filesystem, which is based on the gnulib directory and directories specified by localpath argument. Its main method lookup(file) is used to find file in these directories or @@ -151,7 +151,7 @@ class GLFileSystem(object): #=============================================================================== # Define GLFileAssistant class #=============================================================================== -class GLFileAssistant(object): +class GLFileAssistant: '''GLFileAssistant is used to help with file processing.''' def __init__(self, config: GLConfig, transformers: dict[str, tuple[re.Pattern, str] | None] = {}) -> None: diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index f87ba65109..5cd39f66a3 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -63,7 +63,7 @@ normpath = os.path.normpath #=============================================================================== # Define GLImport class #=============================================================================== -class GLImport(object): +class GLImport: '''GLImport class is used to provide methods for --import, --add-import, --remove-import and --update actions. This is a high-level class, so developers may have to use lower-level classes to create their own diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py index 4dd8dd6e35..c38977c23e 100644 --- a/pygnulib/GLInfo.py +++ b/pygnulib/GLInfo.py @@ -44,7 +44,7 @@ isdir = os.path.isdir #=============================================================================== # Define GLInfo class #=============================================================================== -class GLInfo(object): +class GLInfo: '''This class is used to get formatted information about gnulib-tool. This information is mainly used in stdout messages, but can be used anywhere else. The return values are not the same as for the module, diff --git a/pygnulib/GLMakefileTable.py b/pygnulib/GLMakefileTable.py index 6568a19846..7547116f35 100644 --- a/pygnulib/GLMakefileTable.py +++ b/pygnulib/GLMakefileTable.py @@ -42,7 +42,7 @@ joinpath = constants.joinpath #=============================================================================== # Define GLMakefileTable class #=============================================================================== -class GLMakefileTable(object): +class GLMakefileTable: '''This class is used to edit Makefile and store edits as table. When user creates Makefile.am, he may need to use this class. The internal representation consists of a list of edits. diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index bab143892f..1f5d536fe3 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -56,7 +56,7 @@ filter_filelist = constants.filter_filelist #=============================================================================== # Define GLModuleSystem class #=============================================================================== -class GLModuleSystem(object): +class GLModuleSystem: '''GLModuleSystem is used to operate with module system using dynamic searching and patching.''' @@ -169,7 +169,7 @@ class GLModuleSystem(object): #=============================================================================== # Define GLModule class #=============================================================================== -class GLModule(object): +class GLModule: '''GLModule is used to create a module object from the file with the given path. GLModule can get all information about module, get its dependencies, files, etc.''' @@ -704,7 +704,7 @@ class GLModule(object): #=============================================================================== # Define GLModuleTable class #=============================================================================== -class GLModuleTable(object): +class GLModuleTable: '''GLModuleTable is used to work with the list of the modules.''' def __init__(self, config: GLConfig, inc_all_direct_tests: bool, inc_all_indirect_tests: bool) -> None: diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 7ea1404e30..51c6ee3193 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -95,7 +95,7 @@ def _patch_test_driver() -> None: #=============================================================================== # Define GLTestDir class #=============================================================================== -class GLTestDir(object): +class GLTestDir: '''GLTestDir class is used to create a scratch package with the given list of the modules.''' @@ -883,7 +883,7 @@ class GLTestDir(object): #=============================================================================== # Define GLMegaTestDir class #=============================================================================== -class GLMegaTestDir(object): +class GLMegaTestDir: '''GLMegaTestDir class is used to create a mega scratch package with the given modules one by one and all together.''' -- 2.44.0