>From 0bc144f96608c17963d021468f278a8d0c577894 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 29 Jul 2022 18:45:33 +0200 Subject: [PATCH 3/5] gnulib-tool.py: Modernize coding style. * pygnulib/*.py: Remove parentheses around return value expressions. --- ChangeLog | 3 + pygnulib/GLConfig.py | 104 ++++++++++++++++---------------- pygnulib/GLEmiter.py | 22 +++---- pygnulib/GLError.py | 2 +- pygnulib/GLFileSystem.py | 12 ++-- pygnulib/GLImport.py | 14 ++--- pygnulib/GLInfo.py | 16 ++--- pygnulib/GLMakefileTable.py | 4 +- pygnulib/GLModuleSystem.py | 114 ++++++++++++++++++------------------ pygnulib/GLTestDir.py | 2 +- pygnulib/constants.py | 18 +++--- 11 files changed, 157 insertions(+), 154 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01c73c251f..01d8df2e13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2022-07-29 Bruno Haible + gnulib-tool.py: Modernize coding style. + * pygnulib/*.py: Remove parentheses around return value expressions. + gnulib-tool.py: Modernize the file headers. * pygnulib/*.py: Remove '#!/usr/bin/python' (not needed) and 'encoding: UTF-8' lines (default in Python 3). Add copyright notice. diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index aea34720de..d925e7b2b3 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -284,7 +284,7 @@ class GLConfig(object): # Define special methods. def __repr__(self): '''x.__repr__() <==> repr(x)''' - return('') + return '' def __getitem__(self, y): '''x.__getitem__(y) <==> x[y]''' @@ -296,18 +296,18 @@ class GLConfig(object): if self.table['auxdir']: return self.table['auxdir'] return "build-aux" - return(self.table[y]) + return self.table[y] else: # if y not in self.table raise(KeyError('GLConfig does not contain key: %s' % repr(y))) def dictionary(self): '''Return the configuration as a dict object.''' - return(dict(self.table)) + return dict(self.table) def copy(self): '''Return the copy of the configuration.''' table = copy.deepcopy(self) - return(table) + return table def update(self, dictionary): '''Specify the dictionary whose keys will be used to update config.''' @@ -346,28 +346,28 @@ class GLConfig(object): '''Return default value for the given key.''' if key in self.table: if key == 'libname': - return(string('libgnu')) + return string('libgnu') elif key == 'macro_prefix': - return(string('gl')) + return string('gl') elif key == 'include_guard_prefix': - return(string('GL')) + return string('GL') elif key == 'ac_version': - return(2.59) + return 2.59 elif key == 'verbosity': - return(0) + return 0 elif key == 'copyrights': - return(True) + return True elif key in ['modules', 'avoids', 'tests', 'testflags']: - return(list()) + return list() elif key in ['libtool', 'lgpl', 'conddeps', 'modcache', 'symbolic', 'lsymbolic', 'libtests', 'dryrun']: - return(False) + return False if key == 'vc_files': - return(None) + return None elif key == 'errors': - return(True) + return True else: # otherwise - return(string()) + return string() else: # if key not in self.table raise(KeyError('GLConfig does not contain key: %s' % repr(key))) @@ -375,23 +375,23 @@ class GLConfig(object): '''Check whether the value for the given key is a default value.''' if key in self.table: default = self.default(key) - return(value == default) + return value == default else: # if key not in self.table raise(KeyError('GLConfig does not contain key: %s' % repr(key))) def keys(self): '''Return list of keys.''' - return(list(self.table.keys())) + return list(self.table.keys()) def values(self): '''Return list of values.''' - return(list(self.table.values())) + return list(self.table.values()) # Define destdir methods. def getDestDir(self): '''Return the target directory. For --import, this specifies where your configure.ac can be found. Defaults to current directory.''' - return(self.table['destdir']) + return self.table['destdir'] def setDestDir(self, destdir): '''Specify the target directory. For --import, this specifies where your @@ -414,7 +414,7 @@ class GLConfig(object): def getLocalDir(self): '''Return a local override directory where to look up files before looking in gnulib's directory.''' - return(self.table['localdir']) + return self.table['localdir'] def setLocalDir(self, localdir): '''Specify a local override directory where to look up files before looking @@ -461,7 +461,7 @@ class GLConfig(object): # Define sourcebase methods. def getSourceBase(self): '''Return directory relative to destdir where source code is placed.''' - return(self.table['sourcebase']) + return self.table['sourcebase'] def setSourceBase(self, sourcebase): '''Specify directory relative to destdir where source code is placed.''' @@ -481,7 +481,7 @@ class GLConfig(object): # Define m4base methods. def getM4Base(self): '''Return directory relative to destdir where *.m4 macros are placed.''' - return(self.table['m4base']) + return self.table['m4base'] def setM4Base(self, m4base): '''Specify directory relative to destdir where *.m4 macros are placed.''' @@ -501,7 +501,7 @@ class GLConfig(object): # Define pobase methods. def getPoBase(self): '''Return directory relative to destdir where *.po files are placed.''' - return(self.table['pobase']) + return self.table['pobase'] def setPoBase(self, pobase): '''Specify directory relative to destdir where *.po files are placed.''' @@ -522,7 +522,7 @@ class GLConfig(object): def getDocBase(self): '''Return directory relative to destdir where doc files are placed. Default value for this variable is 'doc').''' - return(self.table['docbase']) + return self.table['docbase'] def setDocBase(self, docbase): '''Specify directory relative to destdir where doc files are placed. @@ -545,7 +545,7 @@ class GLConfig(object): def getTestsBase(self): '''Return directory relative to destdir where unit tests are placed. Default value for this variable is 'tests').''' - return(self.table['testsbase']) + return self.table['testsbase'] def setTestsBase(self, testsbase): '''Specify directory relative to destdir where unit tests are placed. @@ -589,7 +589,7 @@ class GLConfig(object): def getModules(self): '''Return the modules list.''' - return(list(self.table['modules'])) + return list(self.table['modules']) def setModules(self, modules): '''Set the modules list.''' @@ -639,7 +639,7 @@ class GLConfig(object): def getAvoids(self): '''Return the list of the avoided modules.''' - return(list(self.table['avoids'])) + return list(self.table['avoids']) def setAvoids(self, modules): '''Specify the modules which will be avoided.''' @@ -688,7 +688,7 @@ class GLConfig(object): def getFiles(self): '''Return the list of the fileed files.''' - return(list(self.table['files'])) + return list(self.table['files']) def setFiles(self, files): '''Specify the list of files.''' @@ -716,7 +716,7 @@ class GLConfig(object): def checkTestFlag(self, flag): '''Return the status of the test flag.''' if flag in TESTS.values(): - return(flag in self.table['testflags']) + return flag in self.table['testflags'] else: # if flag is not in TESTS raise(TypeError('unknown flag: %s' % repr(flag))) @@ -738,7 +738,7 @@ class GLConfig(object): def getTestFlags(self): '''Return test flags. You can get flags from TESTS variable.''' - return(list(self.table['testflags'])) + return list(self.table['testflags']) def setTestFlags(self, testflags): '''Specify test flags. You can get flags from TESTS variable.''' @@ -763,7 +763,7 @@ class GLConfig(object): # Define libname methods. def getLibName(self): '''Return the library name.''' - return(self.table['libname']) + return self.table['libname'] def setLibName(self, libname): '''Specify the library name.''' @@ -783,7 +783,7 @@ class GLConfig(object): # Define libtool methods. def checkLibtool(self): '''Check if user enabled libtool rules.''' - return(self.table['libtool']) + return self.table['libtool'] def enableLibtool(self): '''Enable libtool rules.''' @@ -800,7 +800,7 @@ class GLConfig(object): # Define conddeps methods. def checkCondDeps(self): '''Check if user enabled cond. dependencies.''' - return(self.table['conddeps']) + return self.table['conddeps'] def enableCondDeps(self): '''Enable cond. dependencies (may save configure time and object code).''' @@ -818,7 +818,7 @@ class GLConfig(object): def getLGPL(self): '''Check for abort if modules aren't available under the LGPL. Default value is False, which means that lgpl is disabled.''' - return(self.table['lgpl']) + return self.table['lgpl'] def setLGPL(self, lgpl): '''Abort if modules aren't available under the LGPL. @@ -835,17 +835,17 @@ class GLConfig(object): def getIncludeGuardPrefix(self): '''Return include_guard_prefix to use inside GLEmiter class.''' - return(self.table['include_guard_prefix']) + return self.table['include_guard_prefix'] def getModuleIndicatorPrefix(self): '''Return module_indicator_prefix to use inside GLEmiter class.''' - return(self.getIncludeGuardPrefix()) + return self.getIncludeGuardPrefix() # Define macro_prefix methods. def getMacroPrefix(self): '''Return the prefix of the macros 'gl_EARLY' and 'gl_INIT'. Default macro_prefix is 'gl'.''' - return(self.table['macro_prefix']) + return self.table['macro_prefix'] def setMacroPrefix(self, macro_prefix): '''Specify the prefix of the macros 'gl_EARLY' and 'gl_INIT'. @@ -879,7 +879,7 @@ class GLConfig(object): def getMakefile(self): '''Return the name of makefile in automake syntax in the source-base and tests-base directories. Default is 'Makefile.am'.''' - return(self.table['makefile']) + return self.table['makefile'] def setMakefile(self, makefile): '''Specify the name of makefile in automake syntax in the source-base and @@ -902,7 +902,7 @@ class GLConfig(object): def getPoDomain(self): '''Return the prefix of the i18n domain. Usually use the package name. A suffix '-gnulib' is appended.''' - return(self.table['podomain']) + return self.table['podomain'] def setPoDomain(self, podomain): '''Specify the prefix of the i18n domain. Usually use the package name. @@ -925,7 +925,7 @@ class GLConfig(object): def getWitnessCMacro(self): '''Return the C macro that is defined when the sources in this directory are compiled or used.''' - return(self.table['witness_c_macro']) + return self.table['witness_c_macro'] def setWitnessCMacro(self, witness_c_macro): '''Specify the C macro that is defined when the sources in this directory @@ -947,7 +947,7 @@ class GLConfig(object): # Define vc_files methods. def checkVCFiles(self): '''Check if update of the version control files is enabled or disabled.''' - return(self.table['vc_files']) + return self.table['vc_files'] def enableVCFiles(self): '''Enable update of the version control files.''' @@ -964,7 +964,7 @@ class GLConfig(object): # Define modcache methods. def checkModuleCaching(self): '''Get status of module caching optimization.''' - return(self.table['modcache']) + return self.table['modcache'] def enableModuleCaching(self): '''Enable module caching optimization.''' @@ -981,7 +981,7 @@ class GLConfig(object): # Define configure_ac methods. def getAutoconfFile(self): '''Return path of autoconf file relative to destdir.''' - return(self.table['configure_ac']) + return self.table['configure_ac'] def setAutoconfFile(self, configure_ac): '''Specify path of autoconf file relative to destdir.''' @@ -1007,7 +1007,7 @@ class GLConfig(object): # Define ac_version methods. def getAutoconfVersion(self): '''Return preferred autoconf version. Default value is 2.59.''' - return(self.table['ac_version']) + return self.table['ac_version'] def setAutoconfVersion(self, ac_version): '''Specify preferred autoconf version. Default value is 2.59.''' @@ -1024,11 +1024,11 @@ class GLConfig(object): # Define symbolic methods. def checkCopyrights(self): '''Check if copyright notices in files should be replaced.''' - return(self.table['copyrights']) + return self.table['copyrights'] def checkSymbolic(self): '''Check if pygnulib will make symbolic links instead of copying files.''' - return(self.table['symbolic']) + return self.table['symbolic'] def enableSymbolic(self): '''Enable creation of the symbolic links instead of copying files.''' @@ -1049,7 +1049,7 @@ class GLConfig(object): def checkLSymbolic(self): '''Check if pygnulib will make symbolic links instead of copying files, only for files from the local override directory.''' - return(self.table['lsymbolic']) + return self.table['lsymbolic'] def enableLSymbolic(self): '''Enable creation of symbolic links instead of copying files, only for @@ -1069,7 +1069,7 @@ class GLConfig(object): # Define verbosity methods. def getVerbosity(self): '''Get verbosity level.''' - return(self.table['verbosity']) + return self.table['verbosity'] def decreaseVerbosity(self): '''Decrease verbosity level.''' @@ -1103,7 +1103,7 @@ class GLConfig(object): # Define libtests methods. def checkLibtests(self): '''Return True if a testsbase/libtests.a is needed.''' - return(self.table['libtests']) + return self.table['libtests'] def enableLibtests(self): '''If libtests is enabled, then testsbase/libtests.a is needed.''' @@ -1120,7 +1120,7 @@ class GLConfig(object): # Define single_configure methods. def checkSingleConfigure(self): '''Check whether single configure file should be generated.''' - return(self.table['single_configure']) + return self.table['single_configure'] def enableSingleConfigure(self): '''Enable generation of the single configure file.''' @@ -1137,7 +1137,7 @@ class GLConfig(object): # Define dryrun methods. def checkDryRun(self): '''Check whether dryrun is enabled.''' - return(self.table['dryrun']) + return self.table['dryrun'] def enableDryRun(self): '''Enable dryrun mode.''' @@ -1154,7 +1154,7 @@ class GLConfig(object): # Define errors methods. def checkErrors(self): '''Check if GLError will be raised in non-critical situations.''' - return(self.table['errors']) + return self.table['errors'] def enableErrors(self): '''Raise GLError in non-critical situations.''' diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 261d94ec88..8f20990f16 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -82,7 +82,7 @@ class GLEmiter(object): def __repr__(self): '''x.__repr__() <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def copyright_notice(self): '''GLEmiter.copyright_notice() -> string @@ -113,7 +113,7 @@ class GLEmiter(object): # Generated by gnulib-tool.\n""" if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def autoconfSnippet(self, module, fileassistant, toplevel, disable_libtool, disable_gettext, replace_auxdir, indentation): @@ -213,7 +213,7 @@ add AM_GNU_GETTEXT([external]) or similar to configure.ac.') emit = constants.nlconvert(emit) if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(emit) + return emit def autoconfSnippets(self, modules, moduletable, fileassistant, verifier, toplevel, disable_libtool, disable_gettext, replace_auxdir): @@ -371,7 +371,7 @@ add AM_GNU_GETTEXT([external]) or similar to configure.ac.') emit = constants.nlconvert(emit) if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(emit) + return emit def po_Makevars(self): '''GLEmiter.po_Makevars() -> string @@ -438,7 +438,7 @@ EXTRA_LOCALE_CATEGORIES = USE_MSGCTXT = no\n""" if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def po_POTFILES_in(self, files): '''GLEmiter.po_POTFILES_in(files) -> string @@ -459,7 +459,7 @@ USE_MSGCTXT = no\n""" emit += '\n' if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def initmacro_start(self, macro_prefix_arg): '''GLEmiter.initmacro_start(macro_prefix_arg) -> string @@ -511,7 +511,7 @@ USE_MSGCTXT = no\n""" emit = emit.replace('%V1%', macro_prefix_arg) if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def initmacro_end(self, macro_prefix_arg): '''GLEmiter.initmacro_end(macro_prefix_arg) -> string @@ -566,7 +566,7 @@ found])]) emit = emit.replace('%V1%', macro_prefix_arg) if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def initmacro_done(self, macro_prefix_arg, sourcebase_arg): '''GLEmiter.initmacro_done(macro_prefix_arg, sourcebase_arg) -> string @@ -618,7 +618,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ emit = emit.replace('%V2%', sourcebase_arg) if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def lib_Makefile_am(self, destfile, modules, moduletable, makefiletable, actioncmd, for_test): @@ -910,7 +910,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ if type(emit) is bytes: emit = emit.decode(ENCS['default']) result = tuple([emit, uses_subdirs]) - return(result) + return result def tests_Makefile_am(self, destfile, modules, makefiletable, witness_macro, for_test): @@ -1199,4 +1199,4 @@ AC_DEFUN([%V1%_LIBSOURCES], [ if type(emit) is bytes: emit = emit.decode(ENCS['default']) result = tuple([emit, uses_subdirs]) - return(result) + return result diff --git a/pygnulib/GLError.py b/pygnulib/GLError.py index 93604999d6..66838e56e6 100644 --- a/pygnulib/GLError.py +++ b/pygnulib/GLError.py @@ -124,4 +124,4 @@ class GLError(Exception): else: # if PYTHON3 self.message = ('[Errno %d] %s' % (self.errno, errors[self.errno - 1])) - return(self.message) + return self.message diff --git a/pygnulib/GLFileSystem.py b/pygnulib/GLFileSystem.py index 1edd6d7776..9d8d2b0cf7 100644 --- a/pygnulib/GLFileSystem.py +++ b/pygnulib/GLFileSystem.py @@ -78,7 +78,7 @@ class GLFileSystem(object): def __repr__(self): '''x.__repr__ <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def lookup(self, name): '''GLFileSystem.lookup(name) -> tuple @@ -121,7 +121,7 @@ class GLFileSystem(object): result = (path_gnulib, False) else: # if path_gnulib does not exist raise(GLError(1, name)) - return(result) + return result #=============================================================================== @@ -160,7 +160,7 @@ class GLFileAssistant(object): def __repr__(self): '''x.__repr__() <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def tmpfilename(self, path): '''GLFileAssistant.tmpfilename() -> string @@ -189,7 +189,7 @@ class GLFileAssistant(object): os.makedirs(dirname) if type(result) is bytes: result = bytes.decode(ENCS['default']) - return(result) + return result def setOriginal(self, original): '''GLFileAssistant.setOriginal(original) @@ -231,7 +231,7 @@ class GLFileAssistant(object): def getFiles(self): '''Return list of the added files.''' - return(list(self.added)) + return list(self.added) def add(self, lookedup, tmpflag, tmpfile): '''GLFileAssistant.add(lookedup, tmpflag, tmpfile) @@ -415,4 +415,4 @@ class GLFileAssistant(object): else: # if self.config['dryrun'] os.remove(tmpfile) result = tuple([basename, backupname, result_flag]) - return(result) + return result diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index 61f700b8c5..10ad069271 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -286,7 +286,7 @@ class GLImport(object): def __repr__(self): '''x.__repr__ <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def rewrite_old_files(self, files): '''GLImport.rewrite_old_files(files) -> list @@ -333,7 +333,7 @@ class GLImport(object): path = file result += [os.path.normpath(path)] result = sorted(set(result)) - return(list(result)) + return list(result) def rewrite_new_files(self, files): '''GLImport.rewrite_new_files(files) @@ -379,7 +379,7 @@ class GLImport(object): path = file result += [os.path.normpath(path)] result = sorted(set(result)) - return(list(result)) + return list(result) def actioncmd(self): '''Return command-line invocation comment.''' @@ -460,7 +460,7 @@ class GLImport(object): actioncmd += ' --no-vc-files' actioncmd += ' ' # Add a space actioncmd += ' '.join(modules) - return(actioncmd) + return actioncmd def gnulib_cache(self): '''GLImport.gnulib_cache() -> string @@ -547,7 +547,7 @@ gnulib-tool.m4 macro invocations:\n''' % actioncmd emit += 'gl_VC_FILES([%s])\n' % vc_files if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(constants.nlconvert(emit)) + return constants.nlconvert(emit) def gnulib_comp(self, files): '''GLImport.gnulib_comp(files) -> string @@ -692,7 +692,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix emit += '])\n' if type(emit) is bytes: emit = emit.decode(ENCS['default']) - return(emit) + return emit def _done_dir_(self, directory, dirs_added, dirs_removed): '''GLImport._done_dir_(directory, dirs_added, dirs_removed) @@ -973,7 +973,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix # Return the result. result = tuple([filetable, transformers]) - return(result) + return result def execute(self, filetable, transformers): '''Perform operations on the lists of files, which are given in a special diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py index b3cc59dc07..d21e09f43d 100644 --- a/pygnulib/GLInfo.py +++ b/pygnulib/GLInfo.py @@ -67,12 +67,12 @@ class GLInfo(object): def __repr__(self): '''x.__repr__ <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def package(self): '''Return formatted string which contains name of the package.''' result = 'GNU gnulib' - return(result) + return result def authors(self): '''Return formatted string which contains authors. @@ -85,7 +85,7 @@ class GLInfo(object): result += 'and %s' % item else: result += '%s, ' % item - return(result) + return result def license(self): '''Return formatted string which contains license and its description.''' @@ -94,13 +94,13 @@ class GLInfo(object): result += 'This is free software: you are free' result += ' to change and redistribute it.\n' result += 'There is NO WARRANTY, to the extent permitted by law.' - return(result) + return result def copyright(self): '''Return formatted string which contains copyright. The special __copyright__ variable is used (type is str).''' result = 'Copyright (C) %s' % __copyright__ - return(result) + return result def date(self): '''Return formatted string which contains date and time in GMT format.''' @@ -120,7 +120,7 @@ class GLInfo(object): proc = sp.check_output(args) result = string(proc, "UTF-8") result = result.rstrip(os.linesep) - return(result) + return result def usage(self): '''Show help message.''' @@ -299,7 +299,7 @@ Options for --import, --add/remove-import, --update: -S, --more-symlinks Deprecated; equivalent to --symlink. Report bugs to .''' - return(result) + return result def version(self): '''Return formatted string which contains git version.''' @@ -310,4 +310,4 @@ Report bugs to .''' result = result.strip() if result == 'UNKNOWN': result = string() - return(result) + return result diff --git a/pygnulib/GLMakefileTable.py b/pygnulib/GLMakefileTable.py index 00050b2723..cff9ff34f9 100644 --- a/pygnulib/GLMakefileTable.py +++ b/pygnulib/GLMakefileTable.py @@ -82,7 +82,7 @@ class GLMakefileTable(object): raise(TypeError('indices must be integers, not %s' % type(y).__name__)) result = self.table[y] - return(dict(result)) + return dict(result) def editor(self, dir, var, val): '''GLMakefileTable.editor(dir, var, val) @@ -140,4 +140,4 @@ class GLMakefileTable(object): '''GLMakefileTable.count() -> int Count number of edits which were applied.''' - return(len(self.table)) + return len(self.table) diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 01e7188c74..d599755ee9 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -82,7 +82,7 @@ class GLModuleSystem(object): def __repr__(self): '''x.__repr__ <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def exists(self, module): '''GLModuleSystem.exists(module) -> bool @@ -107,7 +107,7 @@ class GLModuleSystem(object): ]): # Close all(iterable) function if module not in badnames: result = True - return(result) + return result def find(self, module): '''GLModuleSystem.find(module) -> GLModule @@ -122,7 +122,7 @@ class GLModuleSystem(object): if self.exists(module): path, istemp = self.filesystem.lookup(joinpath('modules', module)) result = GLModule(self.config, path, istemp) - return(result) + return result else: # if not self.exists(module) if self.config['errors']: raise(GLError(3, module)) @@ -184,7 +184,7 @@ class GLModuleSystem(object): os.remove(path) listing = [line for line in result.split('\n') if line.strip()] listing = sorted(set(listing)) - return(listing) + return listing #=============================================================================== @@ -233,7 +233,7 @@ Include:|Link:|License:|Maintainer:)' if type(module) is GLModule: if self.module == module.module: result = True - return(result) + return result def __ne__(self, module): '''x.__ne__(y) <==> x!=y''' @@ -241,7 +241,7 @@ Include:|Link:|License:|Maintainer:)' if type(module) is GLModule: if self.module != module.module: result = True - return(result) + return result def __ge__(self, module): '''x.__ge__(y) <==> x>=y''' @@ -249,7 +249,7 @@ Include:|Link:|License:|Maintainer:)' if type(module) is GLModule: if self.module >= module.module: result = True - return(result) + return result def __gt__(self, module): '''x.__gt__(y) <==> x>y''' @@ -257,14 +257,14 @@ Include:|Link:|License:|Maintainer:)' if type(module) is GLModule: if self.module > module.module: result = True - return(result) + return result def __hash__(self): '''x.__hash__() <==> hash(x)''' module = hash(self.module) patched = hash(self.patched) result = module ^ patched - return(result) + return result def __le__(self, module): '''x.__le__(y) <==> x<=y''' @@ -272,7 +272,7 @@ Include:|Link:|License:|Maintainer:)' if type(module) is GLModule: if self.module <= module.module: result = True - return(result) + return result def __lt__(self, module): '''x.__lt__(y) <==> x str(x)''' result = self.getName() - return(result) + return result def __repr__(self): '''x.__repr__ <==> repr(x)''' result = '' % \ (repr(self.getName()), hex(id(self))) - return(result) + return result def getName(self): '''GLModule.getName() -> string @@ -299,39 +299,39 @@ Include:|Link:|License:|Maintainer:)' Return the name of the module.''' pattern = compiler(joinpath('modules', '(.*?)$')) result = pattern.findall(self.module)[0] - return(result) + return result def isPatched(self): '''GLModule.isPatched() -> bool Check whether module was created after applying patch.''' - return(self.patched) + return self.patched def isTests(self): '''GLModule.isTests() -> bool Check whether module is a -tests version of module.''' result = self.getName().endswith('-tests') - return(result) + return result def isNonTests(self): '''GLModule.isTests() -> bool Check whether module is not a -tests version of module.''' result = not(self.isTests()) - return(result) + return result def getTestsName(self): '''Return -tests version of the module name.''' result = self.getName() if not result.endswith('-tests'): result += '-tests' - return(result) + return result def getTestsModule(self): '''Return -tests version of the module as GLModule.''' result = self.modulesystem.find(self.getTestsName()) - return(result) + return result def getShellFunc(self): '''GLModule.getShellFunc() -> string @@ -354,7 +354,7 @@ Include:|Link:|License:|Maintainer:)' result = 'func_%s_gnulib_m4code_%s' % (macro_prefix, module) if type(result) is bytes: result = result.decode(ENCS['default']) - return(result) + return result def getShellVar(self): '''GLModule.getShellVar() -> string @@ -377,7 +377,7 @@ Include:|Link:|License:|Maintainer:)' result = '%s_gnulib_enabled_%s' % (macro_prefix, module) if type(result) is bytes: result = result.decode(ENCS['default']) - return(result) + return result def getConditionalName(self): '''GLModule.getConditionalName() -> string @@ -398,7 +398,7 @@ Include:|Link:|License:|Maintainer:)' result = '%s_GNULIB_ENABLED_%s' % (macro_prefix, name) if type(result) is bytes: result = result.decode(ENCS['default']) - return(result) + return result def getDescription(self): '''GLModule.getDescription() -> string @@ -419,7 +419,7 @@ Include:|Link:|License:|Maintainer:)' result = result[-1] result = result.strip() self.cache['description'] = result - return(self.cache['description']) + return self.cache['description'] def getComment(self): '''GLModule.getComment() -> string @@ -440,7 +440,7 @@ Include:|Link:|License:|Maintainer:)' result = result[-1] result = result.strip() self.cache['comment'] = result - return(self.cache['comment']) + return self.cache['comment'] def getStatus(self): '''GLModule.getStatus() -> string @@ -466,7 +466,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = [part.strip() for part in parts if part.strip()] self.cache['status'] = list(result) - return(list(self.cache['status'])) + return list(self.cache['status']) def getNotice(self): '''GLModule.getNotice() -> string @@ -492,7 +492,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = ''.join(parts) self.cache['notice'] = result - return(self.cache['notice']) + return self.cache['notice'] def getApplicability(self): '''GLModule.getApplicability() -> string @@ -527,7 +527,7 @@ Include:|Link:|License:|Maintainer:)' result = result.decode(ENCS['default']) result = result.strip() self.cache['applicability'] = result - return(self.cache['applicability']) + return self.cache['applicability'] def getFiles(self): '''GLModule.getFiles() -> list @@ -559,7 +559,7 @@ Include:|Link:|License:|Maintainer:)' result += [joinpath('m4', 'zzgnulib.m4')] result += [joinpath('m4', 'gnulib-common.m4')] self.cache['files'] = list(result) - return(list(self.cache['files'])) + return list(self.cache['files']) def getDependencies(self): '''GLModule.getDependencies() -> list @@ -603,7 +603,7 @@ Include:|Link:|License:|Maintainer:)' condition = condition.decode(ENCS['default']) result += [tuple([self.modulesystem.find(module), condition])] self.cache['dependencies'] = result - return(list(self.cache['dependencies'])) + return list(self.cache['dependencies']) def getAutoconfSnippet_Early(self): '''GLModule.getAutoconfSnippet_Early() -> string @@ -629,7 +629,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = ''.join(parts) self.cache['autoconf-early'] = result - return(self.cache['autoconf-early']) + return self.cache['autoconf-early'] def getAutoconfSnippet(self): '''GLModule.getAutoconfSnippet() -> string @@ -655,7 +655,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = ''.join(parts) self.cache['autoconf'] = result - return(self.cache['autoconf']) + return self.cache['autoconf'] def getAutomakeSnippet(self): '''getAutomakeSnippet() -> string @@ -669,7 +669,7 @@ Include:|Link:|License:|Maintainer:)' else: # if not conditional.strip() result += '\n' result += self.getAutomakeSnippet_Unconditional() - return(result) + return result def getAutomakeSnippet_Conditional(self): '''GLModule.getAutomakeSnippet_Conditional() -> string @@ -695,7 +695,7 @@ Include:|Link:|License:|Maintainer:)' parts += [line] result = ''.join(parts) self.cache['makefile-conditional'] = result - return(self.cache['makefile-conditional']) + return self.cache['makefile-conditional'] def getAutomakeSnippet_Unconditional(self): '''GLModule.getAutomakeSnippet_Unconditional() -> string @@ -767,7 +767,7 @@ Include:|Link:|License:|Maintainer:)' result += '\n\n' result = constants.nlconvert(result) self.cache['makefile-unconditional'] = result - return(self.cache['makefile-unconditional']) + return self.cache['makefile-unconditional'] def getInclude(self): '''GLModule.getInclude() -> string @@ -796,7 +796,7 @@ Include:|Link:|License:|Maintainer:)' pattern = compiler('^(["<].*?[>"])', re.S | re.M) result = pattern.sub('#include \\1', result) self.cache['include'] = result - return(self.cache['include']) + return self.cache['include'] def getLink(self): '''GLModule.getLink() -> string @@ -821,7 +821,7 @@ Include:|Link:|License:|Maintainer:)' parts = [part.strip() for part in parts if part.strip()] # result = ' '.join(parts) self.cache['link'] = parts - return(self.cache['link']) + return self.cache['link'] def getLicense(self): '''GLModule.getLicense(self) -> string @@ -837,7 +837,7 @@ Include:|Link:|License:|Maintainer:)' sys.stderr.write('module %s lacks a license\n' % str(self)) if not license: license = 'GPL' - return(license) + return license def getLicense_Raw(self): '''GLModule.getLicense_Raw() -> string @@ -858,7 +858,7 @@ Include:|Link:|License:|Maintainer:)' result = result[-1] result = result.strip() self.cache['license'] = result - return(self.cache['license']) + return self.cache['license'] def getMaintainer(self): '''GLModule.getMaintainer() -> string @@ -885,7 +885,7 @@ Include:|Link:|License:|Maintainer:)' result = ''.join(parts) result = result.strip() self.cache['maintainer'] = result - return(self.cache['maintainer']) + return self.cache['maintainer'] #=============================================================================== @@ -927,21 +927,21 @@ class GLModuleTable(object): def __repr__(self): '''x.__repr__() <==> repr(x)''' result = '' % hex(id(self)) - return(result) + return result def __getitem__(self, y): '''x.__getitem__(y) <==> x[y]''' if y in ['base', 'final', 'main', 'tests', 'avoids']: if y == 'base': - return(self.getBaseModules()) + return self.getBaseModules() elif y == 'final': - return(self.getFinalModules()) + return self.getFinalModules() elif y == 'main': - return(self.getMainModules()) + return self.getMainModules() elif y == 'tests': - return(self.getTestsModules()) + return self.getTestsModules() else: # if y == 'avoids' - return(self.getAvoids()) + return self.getAvoids() else: # if y is not in list raise(KeyError('GLModuleTable does not contain key: %s' % repr(y))) @@ -988,7 +988,7 @@ class GLModuleTable(object): raise(TypeError('module must be a GLModule, not %s' % type(module).__name__)) result = str(module) in self.dependers - return(result) + return result def getCondition(self, parent, module): '''GLModuleTable.getCondition(module) -> string or True @@ -1005,7 +1005,7 @@ class GLModuleTable(object): result = None if key in self.conditionals: result = self.conditionals[key] - return(result) + return result def transitive_closure(self, modules): '''GLModuleTable.transitive_closure(modules) -> list @@ -1101,7 +1101,7 @@ class GLModuleTable(object): inmodules = sorted(set(inmodules)) modules = sorted(set(outmodules)) self.modules = modules - return(list(modules)) + return list(modules) def transitive_closure_separately(self, basemodules, finalmodules): '''GLModuleTable.transitive_closure_separately(*args, **kwargs) -> tuple @@ -1143,7 +1143,7 @@ class GLModuleTable(object): set(self.config['testflags'] + [TESTS['tests']])) self.config.setTestFlags(testflags) result = tuple([main_modules, tests_modules]) - return(result) + return result def add_dummy(self, modules): '''GLModuleTable.add_dummy(modules) -> list @@ -1171,7 +1171,7 @@ class GLModuleTable(object): if not have_lib_sources: dummy = self.modulesystem.find('dummy') modules = sorted(set(modules + [dummy])) - return(list(modules)) + return list(modules) def filelist(self, modules): '''GLModuleTable.filelist(modules) -> list @@ -1189,7 +1189,7 @@ class GLModuleTable(object): for file in listing: if file not in filelist: filelist += [file] - return(filelist) + return filelist def filelist_separately(self, main_modules, tests_modules): '''GLModuleTable.filelist_separately(**kwargs) -> list @@ -1208,13 +1208,13 @@ class GLModuleTable(object): for file in tests_filelist ] # Finish to sort filelist result = tuple([main_filelist, tests_filelist]) - return(result) + return result def getAvoids(self): '''GLModuleTable.getAvoids() -> list Return list of avoids.''' - return(list(self.avoids)) + return list(self.avoids) def setAvoids(self, modules): '''GLModuleTable.setAvoids(modules) @@ -1229,7 +1229,7 @@ class GLModuleTable(object): '''GLModuleTable.getBaseModules() -> list Return list of base modules.''' - return(list(self.base_modules)) + return list(self.base_modules) def setBaseModules(self, modules): '''GLModuleTable.setBaseModules(modules) @@ -1244,7 +1244,7 @@ class GLModuleTable(object): '''GLModuleTable.getFinalModules() -> list Return list of final modules.''' - return(list(self.final_modules)) + return list(self.final_modules) def setFinalModules(self, modules): '''GLModuleTable.setFinalModules(modules) @@ -1259,7 +1259,7 @@ class GLModuleTable(object): '''GLModuleTable.getMainModules() -> list Return list of main modules.''' - return(list(self.main_modules)) + return list(self.main_modules) def setMainModules(self, modules): '''GLModuleTable.setMainModules(modules) @@ -1274,7 +1274,7 @@ class GLModuleTable(object): '''GLModuleTable.getTestsModules() -> list Return list of tests modules.''' - return(list(self.tests_modules)) + return list(self.tests_modules) def setTestsModules(self, modules): '''GLModuleTable.setTestsModules(modules) diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index c0657acc0d..6433a0d78c 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -152,7 +152,7 @@ class GLTestDir(object): path = file result += [os.path.normpath(path)] result = sorted(set(result)) - return(list(result)) + return list(result) def execute(self): '''GLTestDir.execute() diff --git a/pygnulib/constants.py b/pygnulib/constants.py index f36a9e0a7d..235f5d8891 100644 --- a/pygnulib/constants.py +++ b/pygnulib/constants.py @@ -269,7 +269,7 @@ def compiler(pattern, flags=0): pattern = re.compile(pattern, re.UNICODE | flags) else: # if PYTHON3 pattern = re.compile(pattern, flags) - return(pattern) + return pattern def cleaner(sequence): @@ -285,7 +285,7 @@ def cleaner(sequence): sequence = [False if value == 'false' else value for value in sequence] sequence = [True if value == 'true' else value for value in sequence] sequence = [value.strip() for value in sequence] - return(sequence) + return sequence def joinpath(head, *tail): @@ -304,7 +304,7 @@ def joinpath(head, *tail): result = os.path.normpath(os.path.join(head, *tail)) if type(result) is bytes: result = result.decode(ENCS['default']) - return(result) + return result def relativize(dir1, dir2): @@ -338,7 +338,7 @@ def relativize(dir1, dir2): dir0 = joinpath(dir0, first) dir1 = dir1[dir1.find(os.path.sep) + 1:] result = os.path.normpath(dir2) - return(result) + return result def link_relative(src, dest): @@ -405,7 +405,7 @@ def filter_filelist(separator, filelist, (added_prefix, added_suffix), filename) listing += [result] result = separator.join(listing) - return(result) + return result def substart(orig, repl, data): @@ -416,7 +416,7 @@ def substart(orig, repl, data): result = data if data.startswith(orig): result = repl + data[len(orig):] - return(result) + return result def subend(orig, repl, data): @@ -427,7 +427,7 @@ def subend(orig, repl, data): result = data if data.endswith(orig): result = data[:-len(orig)] + repl - return(result) + return result def nlconvert(text): @@ -436,7 +436,7 @@ def nlconvert(text): text = text.replace('\r\n', '\n') if system == 'windows': text = text.replace('\n', '\r\n') - return(text) + return text def nlremove(text): @@ -446,7 +446,7 @@ def nlremove(text): lines = [line for line in text.split('\n') if line != ''] text = '\n'.join(lines) text = nlconvert(text) - return(text) + return text def remove_backslash_newline(text): -- 2.34.1