diff options
| author | Wolfgang E. Sanyer <WolfgangESanyer@gmail.com> | 2021-09-20 08:49:15 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-09-20 15:51:52 -0700 |
| commit | bbcd72b5fe85fe9bbca1913f8aa22077d94e75d0 (patch) | |
| tree | 64a38c9e94cad7c800fcd1ca7307632f603e1315 /bin | |
| parent | 55170b5be88df6d5d8f6e07ecb39fc1a86d3426a (diff) | |
| download | gentoolkit-bbcd72b5fe85fe9bbca1913f8aa22077d94e75d0.tar.gz | |
Change tabs to spaces (using autopep8). Also, format repo using black.
The following command was used to change the tabs to spaces:
autopep8 --in-place --select=E101,E11,E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E133,E20,E211,E22,E224,E224,E226,E227,E228,E231,E241,E242,E251,E252,E26,E265,E266,E27,E301,E302,E303,E304,E305,E306,W291,W293,W391 -r .
And then black was run as `black .` on the entire tree
Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer@gmail.com>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/eclean | 33 | ||||
| -rwxr-xr-x | bin/eclean-dist | 33 | ||||
| -rwxr-xr-x | bin/eclean-pkg | 33 | ||||
| -rwxr-xr-x | bin/ekeyword | 28 | ||||
| -rwxr-xr-x | bin/enalyze | 40 | ||||
| -rwxr-xr-x | bin/epkginfo | 54 | ||||
| -rwxr-xr-x | bin/equery | 44 | ||||
| -rwxr-xr-x | bin/eshowkw | 2 | ||||
| -rwxr-xr-x | bin/imlate | 28 | ||||
| -rwxr-xr-x | bin/merge-driver-ekeyword | 9 | ||||
| -rwxr-xr-x | bin/revdep-rebuild | 42 |
11 files changed, 173 insertions, 173 deletions
@@ -6,9 +6,9 @@ Distributed under the terms of the GNU General Public License v2 # Meta: __author__ = "Thomas de Grenier de Latour (tgl), " + \ - "modular re-write by: Brian Dolbec (dol-sen)" + "modular re-write by: Brian Dolbec (dol-sen)" __email__ = "degrenier@easyconnect.fr, " + \ - "brian.dolbec@gmail.com" + "brian.dolbec@gmail.com" __version__ = "git" __productname__ = "eclean" __description__ = "A cleaning tool for Gentoo distfiles and binaries." @@ -18,29 +18,28 @@ import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit.eclean.cli import main try: - main() + main() except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) + print("Aborted.") + sys.exit(130) sys.exit(0) - diff --git a/bin/eclean-dist b/bin/eclean-dist index 90f9e55..c315c88 100755 --- a/bin/eclean-dist +++ b/bin/eclean-dist @@ -6,9 +6,9 @@ Distributed under the terms of the GNU General Public License v2 # Meta: __author__ = "Thomas de Grenier de Latour (tgl), " + \ - "modular re-write by: Brian Dolbec (dol-sen)" + "modular re-write by: Brian Dolbec (dol-sen)" __email__ = "degrenier@easyconnect.fr, " + \ - "brian.dolbec@gmail.com" + "brian.dolbec@gmail.com" __version__ = "git" __productname__ = "eclean" __description__ = "A cleaning tool for Gentoo distfiles and binaries." @@ -18,29 +18,28 @@ import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit.eclean.cli import main try: - main() + main() except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) + print("Aborted.") + sys.exit(130) sys.exit(0) - diff --git a/bin/eclean-pkg b/bin/eclean-pkg index 90f9e55..c315c88 100755 --- a/bin/eclean-pkg +++ b/bin/eclean-pkg @@ -6,9 +6,9 @@ Distributed under the terms of the GNU General Public License v2 # Meta: __author__ = "Thomas de Grenier de Latour (tgl), " + \ - "modular re-write by: Brian Dolbec (dol-sen)" + "modular re-write by: Brian Dolbec (dol-sen)" __email__ = "degrenier@easyconnect.fr, " + \ - "brian.dolbec@gmail.com" + "brian.dolbec@gmail.com" __version__ = "git" __productname__ = "eclean" __description__ = "A cleaning tool for Gentoo distfiles and binaries." @@ -18,29 +18,28 @@ import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit.eclean.cli import main try: - main() + main() except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) + print("Aborted.") + sys.exit(130) sys.exit(0) - diff --git a/bin/ekeyword b/bin/ekeyword index 8767fe3..c45ff5c 100755 --- a/bin/ekeyword +++ b/bin/ekeyword @@ -15,27 +15,27 @@ import os import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit.ekeyword import ekeyword try: - ekeyword.main(sys.argv[1:]) + ekeyword.main(sys.argv[1:]) except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) + print("Aborted.") + sys.exit(130) sys.exit(0) diff --git a/bin/enalyze b/bin/enalyze index 9e27bed..caa3362 100755 --- a/bin/enalyze +++ b/bin/enalyze @@ -13,32 +13,32 @@ files in the event of corruption, and possibly more. import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit import enalyze, errors try: - enalyze.main() + enalyze.main() except errors.GentoolkitException as err: - if '--debug' in sys.argv: - raise - else: - from gentoolkit import pprinter as pp - sys.stderr.write(pp.error(str(err))) - print() - print("Add '--debug' to global options for traceback.") - sys.exit(1) + if '--debug' in sys.argv: + raise + else: + from gentoolkit import pprinter as pp + sys.stderr.write(pp.error(str(err))) + print() + print("Add '--debug' to global options for traceback.") + sys.exit(1) diff --git a/bin/epkginfo b/bin/epkginfo index 5d3aab2..4cb483e 100755 --- a/bin/epkginfo +++ b/bin/epkginfo @@ -6,11 +6,11 @@ """Shortcut to equery meta""" __authors__ = ( - 'Douglas Anderson <douglasjanderson@gmail.com>: equery meta', - 'Ned Ludd <solar@gentoo.org>: first full implimentation' - 'Eldad Zack <eldad@gentoo.org>: earch', - 'Eric Olinger <EvvL AT RustedHalo DOT net>: metadata' - ) + 'Douglas Anderson <douglasjanderson@gmail.com>: equery meta', + 'Ned Ludd <solar@gentoo.org>: first full implimentation' + 'Eldad Zack <eldad@gentoo.org>: earch', + 'Eric Olinger <EvvL AT RustedHalo DOT net>: metadata' +) import sys @@ -19,32 +19,34 @@ from gentoolkit.equery import mod_usage from gentoolkit.equery.meta import main, print_help from portage.exception import AmbiguousPackageName + def print_epkginfo_help(): - print(mod_usage(mod_name="epkginfo")) - print() - print_help(with_usage=False) + print(mod_usage(mod_name="epkginfo")) + print() + print_help(with_usage=False) + equery.initialize_configuration() args = sys.argv[1:] if not args or set(('-h', '--help')).intersection(args): - print_epkginfo_help() + print_epkginfo_help() else: - try: - main(args) - except AmbiguousPackageName as e: - pkgs = e.args[0] - for candidate in pkgs: - print(candidate) - - from gentoolkit import pprinter as pp - from os.path import basename # To get the short name - - print(file=sys.stderr) - print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])), - file=sys.stderr, end="") - pp.die(1, "one of the above fully-qualified ebuild names instead.") - except errors.GentoolkitException as err: - from gentoolkit import pprinter as pp - pp.die(1, str(err)) + try: + main(args) + except AmbiguousPackageName as e: + pkgs = e.args[0] + for candidate in pkgs: + print(candidate) + + from gentoolkit import pprinter as pp + from os.path import basename # To get the short name + + print(file=sys.stderr) + print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])), + file=sys.stderr, end="") + pp.die(1, "one of the above fully-qualified ebuild names instead.") + except errors.GentoolkitException as err: + from gentoolkit import pprinter as pp + pp.die(1, str(err)) # vim: set ts=4 sw=4 tw=79: @@ -12,35 +12,35 @@ import os import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit import equery, errors try: - equery.main(sys.argv) + equery.main(sys.argv) except errors.GentoolkitNonZeroExit as err: - sys.exit(err.return_code) + sys.exit(err.return_code) except errors.GentoolkitException as err: - if '--debug' in sys.argv or bool(os.getenv('DEBUG', False)): - raise - else: - from gentoolkit import pprinter as pp - sys.stderr.write(pp.error(str(err))) - if err.is_serious: - print() - print("Add '--debug' to global options for traceback.") - sys.exit(1) + if '--debug' in sys.argv or bool(os.getenv('DEBUG', False)): + raise + else: + from gentoolkit import pprinter as pp + sys.stderr.write(pp.error(str(err))) + if err.is_serious: + print() + print("Add '--debug' to global options for traceback.") + sys.exit(1) diff --git a/bin/eshowkw b/bin/eshowkw index e987cce..0ef4dda 100755 --- a/bin/eshowkw +++ b/bin/eshowkw @@ -6,4 +6,4 @@ import sys from gentoolkit.eshowkw import main as emain -sys.exit(emain(sys.argv[1:]))
\ No newline at end of file +sys.exit(emain(sys.argv[1:])) @@ -15,27 +15,27 @@ import os import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit.imlate import imlate try: - imlate.main() + imlate.main() except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) + print("Aborted.") + sys.exit(130) sys.exit(0) diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index 7f4a10b..73e0430 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -21,6 +21,7 @@ from gentoolkit.ekeyword import ekeyword KeywordChanges = List[Tuple[Optional[List[str]], Optional[List[str]]]] + def keyword_array(keyword_line: str) -> List[str]: # Find indices of string inside the double-quotes i1: int = keyword_line.find('"') + 1 @@ -112,10 +113,10 @@ def main(argv: Sequence[str]) -> int: if len(argv) != 5: sys.exit(-1) - O = argv[1] # %O - filename of original - A = argv[2] # %A - filename of our current version - B = argv[3] # %B - filename of the other branch's version - P = argv[4] # %P - original path of the file + O = argv[1] # %O - filename of original + A = argv[2] # %A - filename of our current version + B = argv[3] # %B - filename of the other branch's version + P = argv[4] # %P - original path of the file # Get changes from %O to %B changes = keyword_changes(O, B) diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild index 51783c5..332dfcf 100755 --- a/bin/revdep-rebuild +++ b/bin/revdep-rebuild @@ -12,35 +12,35 @@ dependent upon the upgraded package. import sys # This block ensures that ^C interrupts are handled quietly. try: - import signal + import signal - def exithandler(signum,frame): - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_IGN) - print() - sys.exit(1) + def exithandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + print() + sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) except KeyboardInterrupt: - print() - sys.exit(1) + print() + sys.exit(1) from gentoolkit import errors from gentoolkit.revdep_rebuild import rebuild try: - success = rebuild.main(rebuild.parse_options()) - sys.exit(success) + success = rebuild.main(rebuild.parse_options()) + sys.exit(success) except errors.GentoolkitException as err: - if '--debug' in sys.argv: - raise - else: - from gentoolkit import pprinter as pp - sys.stderr.write(pp.error(str(err))) - print() - print("Add '--debug' to global options for traceback.") - sys.exit(1) + if '--debug' in sys.argv: + raise + else: + from gentoolkit import pprinter as pp + sys.stderr.write(pp.error(str(err))) + print() + print("Add '--debug' to global options for traceback.") + sys.exit(1) |
