Skip to content

Commit

Permalink
Change tabs to spaces (using autopep8). Also, format repo using black.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
  • Loading branch information
ezzieyguywuf authored and mattst88 committed Sep 20, 2021
1 parent 55170b5 commit bbcd72b
Show file tree
Hide file tree
Showing 85 changed files with 15,252 additions and 14,032 deletions.
33 changes: 16 additions & 17 deletions bin/eclean
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = "[email protected], " + \
"[email protected]"
"[email protected]"
__version__ = "git"
__productname__ = "eclean"
__description__ = "A cleaning tool for Gentoo distfiles and binaries."
Expand All @@ -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)

33 changes: 16 additions & 17 deletions bin/eclean-dist
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = "[email protected], " + \
"[email protected]"
"[email protected]"
__version__ = "git"
__productname__ = "eclean"
__description__ = "A cleaning tool for Gentoo distfiles and binaries."
Expand All @@ -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)

33 changes: 16 additions & 17 deletions bin/eclean-pkg
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = "[email protected], " + \
"[email protected]"
"[email protected]"
__version__ = "git"
__productname__ = "eclean"
__description__ = "A cleaning tool for Gentoo distfiles and binaries."
Expand All @@ -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)

28 changes: 14 additions & 14 deletions bin/ekeyword
Original file line number Diff line number Diff line change
Expand Up @@ -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)
40 changes: 20 additions & 20 deletions bin/enalyze
Original file line number Diff line number Diff line change
Expand Up @@ -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)
54 changes: 28 additions & 26 deletions bin/epkginfo
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"""Shortcut to equery meta"""

__authors__ = (
'Douglas Anderson <[email protected]>: equery meta',
'Ned Ludd <[email protected]>: first full implimentation'
'Eldad Zack <[email protected]>: earch',
'Eric Olinger <EvvL AT RustedHalo DOT net>: metadata'
)
'Douglas Anderson <[email protected]>: equery meta',
'Ned Ludd <[email protected]>: first full implimentation'
'Eldad Zack <[email protected]>: earch',
'Eric Olinger <EvvL AT RustedHalo DOT net>: metadata'
)

import sys

Expand All @@ -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:
44 changes: 22 additions & 22 deletions bin/equery
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Loading

0 comments on commit bbcd72b

Please sign in to comment.