diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-07-30 11:45:36 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-07-31 07:07:32 +0200 |
| commit | d2abfb903c5bd24fb6b39e39bb2af15ee4c6a14f (patch) | |
| tree | 1db34d26a010db73104b680fcd766c3e37b880b0 /gnulib-tool.py | |
| parent | 5d39cdb46a0ab98506d1be1cbf6ec58950ff93e4 (diff) | |
| download | gnulib-d2abfb903c5bd24fb6b39e39bb2af15ee4c6a14f.tar.gz | |
gnulib-tool.py: Assume Python 3.
* gnulib-tool.py: Don't set PYTHON3, string. Use str instead of string.
* pygnulib/*.py: Likewise.
Diffstat (limited to 'gnulib-tool.py')
| -rwxr-xr-x | gnulib-tool.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnulib-tool.py b/gnulib-tool.py index 860487a934..ae4a839da9 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -47,7 +47,6 @@ from pygnulib import classes #=============================================================================== # Define global constants #=============================================================================== -PYTHON3 = constants.PYTHON3 APP = constants.APP DIRS = constants.DIRS ENCS = constants.ENCS @@ -57,7 +56,6 @@ TESTS = constants.TESTS compiler = constants.compiler joinpath = constants.joinpath cleaner = constants.cleaner -string = constants.string isabs = os.path.isabs isdir = os.path.isdir isfile = os.path.isfile @@ -801,7 +799,7 @@ def main(): print('\n'.join(files)) elif mode == 'extract-dependencies': - result = string() + result = '' if avoids: message = '%s: *** ' % constants.APP['name'] message += 'cannot combine --avoid and --extract-dependencies\n' @@ -891,7 +889,7 @@ def main(): filesystem = classes.GLFileSystem(config) lookedup, flag = filesystem.lookup(srcpath) if isdir(dest): - destdir = string(dest) + destdir = str(dest) if srcpath.startswith('build-aux/'): destpath = constants.substart( 'build-aux/', '%s/' % auxdir, srcpath) @@ -960,7 +958,7 @@ if __name__ == '__main__': if errmode == 0: message = '%s: *** ' % constants.APP['name'] if errinfo == None: - errinfo = string() + errinfo = '' if errno == 1: message += 'file %s not found' % errinfo elif errno == 2: @@ -990,7 +988,7 @@ if __name__ == '__main__': message = 'gnulib-tool: option --conditional-dependencies is not ' message += 'supported with --with-tests\n' elif errno == 11: - incompatibilities = string() + incompatibilities = '' message += 'incompatible license on modules:%s' % constants.NL for pair in errinfo: incompatibilities += pair[0] |