>From dd7b332f80d76f35d7be012c7c35007716334719 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 30 Jul 2022 13:51:36 +0200 Subject: [PATCH 4/4] gnulib-tool.py: Clean up imports. * gnulib-tool.py: Remove unused constants. * pygnulib/*.py: Likewise. --- ChangeLog | 4 ++++ gnulib-tool.py | 4 ---- pygnulib/GLConfig.py | 8 -------- pygnulib/GLEmiter.py | 9 --------- pygnulib/GLError.py | 14 -------------- pygnulib/GLFileSystem.py | 10 ---------- pygnulib/GLImport.py | 4 ---- pygnulib/GLInfo.py | 11 ----------- pygnulib/GLMakefileTable.py | 13 ------------- pygnulib/GLModuleSystem.py | 8 -------- pygnulib/GLTestDir.py | 6 ------ 11 files changed, 4 insertions(+), 87 deletions(-) diff --git a/ChangeLog b/ChangeLog index f065ed9d4d..4235a4b6d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2022-07-30 Bruno Haible + gnulib-tool.py: Clean up imports. + * gnulib-tool.py: Remove unused constants. + * pygnulib/*.py: Likewise. + gnulib-tool.py: Assume Python 3. * gnulib-tool.py: Don't allow 'bytes' as an alternative to 'str'. * pygnulib/*.py: Likewise. diff --git a/gnulib-tool.py b/gnulib-tool.py index e36f84b6ab..523de7769e 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -48,19 +48,15 @@ from pygnulib import classes # Define global constants #=============================================================================== APP = constants.APP -DIRS = constants.DIRS ENCS = constants.ENCS UTILS = constants.UTILS MODES = constants.MODES TESTS = constants.TESTS compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner isabs = os.path.isabs isdir = os.path.isdir isfile = os.path.isfile -normpath = os.path.normpath -relpath = os.path.relpath #=============================================================================== diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index 6f314be865..457dc2c1e3 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -38,18 +38,10 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP -DIRS = constants.DIRS -UTILS = constants.UTILS MODES = constants.MODES TESTS = constants.TESTS -compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner relpath = constants.relativize -isabs = os.path.isabs -isdir = os.path.isdir isfile = os.path.isfile normpath = os.path.normpath diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 1d81be84cd..c41d4c5518 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -44,20 +44,11 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP -DIRS = constants.DIRS -UTILS = constants.UTILS -MODES = constants.MODES TESTS = constants.TESTS compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner -isabs = os.path.isabs -isdir = os.path.isdir isfile = os.path.isfile normpath = os.path.normpath -relpath = os.path.relpath #=============================================================================== diff --git a/pygnulib/GLError.py b/pygnulib/GLError.py index 0382035427..a7cb81afe2 100644 --- a/pygnulib/GLError.py +++ b/pygnulib/GLError.py @@ -35,20 +35,6 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP -DIRS = constants.DIRS -UTILS = constants.UTILS -MODES = constants.MODES -TESTS = constants.TESTS -compiler = constants.compiler -joinpath = constants.joinpath -cleaner = constants.cleaner -isabs = os.path.isabs -isdir = os.path.isdir -isfile = os.path.isfile -normpath = os.path.normpath -relpath = os.path.relpath #=============================================================================== diff --git a/pygnulib/GLFileSystem.py b/pygnulib/GLFileSystem.py index 4660dabdee..f17466187d 100644 --- a/pygnulib/GLFileSystem.py +++ b/pygnulib/GLFileSystem.py @@ -39,20 +39,10 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP DIRS = constants.DIRS -UTILS = constants.UTILS -MODES = constants.MODES -TESTS = constants.TESTS -compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner -isabs = os.path.isabs isdir = os.path.isdir isfile = os.path.isfile -normpath = os.path.normpath -relpath = os.path.relpath #=============================================================================== diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index dd3b739571..b2691a976d 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -47,10 +47,6 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP -DIRS = constants.DIRS -UTILS = constants.UTILS MODES = constants.MODES TESTS = constants.TESTS compiler = constants.compiler diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py index 6ee1891886..f66e469670 100644 --- a/pygnulib/GLInfo.py +++ b/pygnulib/GLInfo.py @@ -36,20 +36,9 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP DIRS = constants.DIRS -UTILS = constants.UTILS -MODES = constants.MODES -TESTS = constants.TESTS -compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner -isabs = os.path.isabs isdir = os.path.isdir -isfile = os.path.isfile -normpath = os.path.normpath -relpath = os.path.relpath #=============================================================================== diff --git a/pygnulib/GLMakefileTable.py b/pygnulib/GLMakefileTable.py index 95ceeeee63..4ee85b4d0c 100644 --- a/pygnulib/GLMakefileTable.py +++ b/pygnulib/GLMakefileTable.py @@ -39,21 +39,8 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP -DIRS = constants.DIRS -UTILS = constants.UTILS -MODES = constants.MODES TESTS = constants.TESTS -compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner -isabs = os.path.isabs -isdir = os.path.isdir -isfile = os.path.isfile -normpath = os.path.normpath -relpath = os.path.relpath -filter_filelist = constants.filter_filelist #=============================================================================== diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index f2b7a9cf0d..48515ce36d 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -39,21 +39,13 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP DIRS = constants.DIRS ENCS = constants.ENCS -UTILS = constants.UTILS -MODES = constants.MODES TESTS = constants.TESTS compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner -isabs = os.path.isabs isdir = os.path.isdir isfile = os.path.isfile -normpath = os.path.normpath -relpath = os.path.relpath filter_filelist = constants.filter_filelist diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 6b2d45a493..79f67a8fdc 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -47,17 +47,11 @@ __copyright__ = constants.__copyright__ #=============================================================================== # Define global constants #=============================================================================== -NoneType = type(None) -APP = constants.APP DIRS = constants.DIRS UTILS = constants.UTILS -MODES = constants.MODES TESTS = constants.TESTS compiler = constants.compiler joinpath = constants.joinpath -cleaner = constants.cleaner -relpath = constants.relativize -isabs = os.path.isabs isdir = os.path.isdir isfile = os.path.isfile normpath = os.path.normpath -- 2.34.1