>From 6ef9c33342e6cdb898e157997ea33ed2ab8e00cb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 6 Aug 2022 03:18:32 +0200 Subject: [PATCH 12/12] gnulib-tool.py: Don't initialize local variables too early. * gnulib-tool.py (main): Initialize each local variable in one place. I prefer to have pylint tell me about uninitialized variables than to get the value None at runtime. --- ChangeLog | 5 +++++ gnulib-tool.py | 33 +++++++-------------------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index fde81debea..dc968b8982 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2022-08-05 Bruno Haible + gnulib-tool.py: Don't initialize local variables too early. + * gnulib-tool.py (main): Initialize each local variable in one place. + I prefer to have pylint tell me about uninitialized variables than to + get the value None at runtime. + gnulib-tool.py: Finish implementing option --po-domain. * gnulib-tool.py (main): Accept option --po-domain. * pygnulib/GLEmiter.py (GLEmiter.po_POTFILES_in): Fix variable diff --git a/gnulib-tool.py b/gnulib-tool.py index 8dbf2d06a8..78bb326a69 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -67,32 +67,6 @@ isfile = os.path.isfile # Define main part #=============================================================================== def main(): - # Reset arguments - mode = None - destdir = None - localpath = None - verbose = None - auxdir = None - modules = None - avoids = None - sourcebase = None - m4base = None - pobase = None - docbase = None - testsbase = None - tests = None - libname = None - lgpl = None - makefile_name = None - libtool = None - conddeps = None - macro_prefix = None - podomain = None - witness_c_macro = None - vc_files = None - dryrun = None - errors = None - info = classes.GLInfo() parser = argparse.ArgumentParser( prog=constants.APP['name'], @@ -467,6 +441,9 @@ def main(): sys.exit(1) # Determine selected mode. + mode = None + modules = None + files = None if cmdargs.mode_list != None: mode = 'list' if cmdargs.mode_import != None: @@ -671,6 +648,10 @@ def main(): symlink = cmdargs.symlink == True lsymlink = cmdargs.lsymlink == True single_configure = cmdargs.single_configure + docbase = None + conddeps = None + witness_c_macro = None + vc_files = None # Create pygnulib configuration. config = classes.GLConfig( -- 2.34.1