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>

1 files changed, 221 insertions, 203 deletions

diff --git a/pym/gentoolkit/equery/list_.py b/pym/gentoolkit/equery/list_.py
index f66dfed..1e03d91 100644
--- a/pym/gentoolkit/equery/list_.py
+++ b/pym/gentoolkit/equery/list_.py
@@ -4,7 +4,7 @@
 
 """List installed packages matching the query pattern"""
 
-__docformat__ = 'epytext'
+__docformat__ = "epytext"
 
 # =======
 # Imports
@@ -25,231 +25,249 @@ from gentoolkit.query import Query
 # =======
 
 QUERY_OPTS = {
-	"duplicates": False,
-	"in_installed": True,
-	"in_porttree": False,
-	"in_overlay": False,
-	"include_mask_reason": False,
-	"is_regex": False,
-	"show_progress": (not CONFIG['quiet']),
-	"package_format": None,
-	"binpkgs-missing": False
+    "duplicates": False,
+    "in_installed": True,
+    "in_porttree": False,
+    "in_overlay": False,
+    "include_mask_reason": False,
+    "is_regex": False,
+    "show_progress": (not CONFIG["quiet"]),
+    "package_format": None,
+    "binpkgs-missing": False,
 }
 
 # =========
 # Functions
 # =========
 
+
 def print_help(with_description=True):
-	"""Print description, usage and a detailed help message.
-
-	@type with_description: bool
-	@param with_description: if true, print module's __doc__ string
-	"""
-
-	if with_description:
-		print(__doc__.strip())
-		print()
-
-	# Deprecation warning added by djanderson, 12/2008
-	depwarning = (
-		"Default action for this module has changed in Gentoolkit 0.3.",
-		"Use globbing to simulate the old behavior (see man equery).",
-		"Use '*' to check all installed packages.",
-		"Use 'foo-bar/*' to filter by category."
-	)
-	for line in depwarning:
-		sys.stderr.write(pp.warn(line))
-	print()
-
-	print(mod_usage(mod_name="list"))
-	print()
-	print(pp.command("options"))
-	print(format_options((
-		(" -h, --help", "display this help message"),
-		(" -d, --duplicates", "list only installed duplicate packages"),
-		(" -b, --binpkgs-missing", "list only installed packages without a corresponding binary package"),
-		(" -f, --full-regex", "query is a regular expression"),
-		(" -m, --mask-reason", "include reason for package mask"),
-		(" -I, --exclude-installed",
-			"exclude installed packages from output"),
-		(" -o, --overlay-tree", "list packages in overlays"),
-		(" -p, --portage-tree", "list packages in the main portage tree"),
-		(" -F, --format=TMPL", "specify a custom output format"),
-        ("              TMPL",
-			"a format template using (see man page):")
-	)))
-	print(" " * 24, ', '.join(pp.emph(x) for x in FORMAT_TMPL_VARS))
+    """Print description, usage and a detailed help message.
+
+    @type with_description: bool
+    @param with_description: if true, print module's __doc__ string
+    """
+
+    if with_description:
+        print(__doc__.strip())
+        print()
+
+    # Deprecation warning added by djanderson, 12/2008
+    depwarning = (
+        "Default action for this module has changed in Gentoolkit 0.3.",
+        "Use globbing to simulate the old behavior (see man equery).",
+        "Use '*' to check all installed packages.",
+        "Use 'foo-bar/*' to filter by category.",
+    )
+    for line in depwarning:
+        sys.stderr.write(pp.warn(line))
+    print()
+
+    print(mod_usage(mod_name="list"))
+    print()
+    print(pp.command("options"))
+    print(
+        format_options(
+            (
+                (" -h, --help", "display this help message"),
+                (" -d, --duplicates", "list only installed duplicate packages"),
+                (
+                    " -b, --binpkgs-missing",
+                    "list only installed packages without a corresponding binary package",
+                ),
+                (" -f, --full-regex", "query is a regular expression"),
+                (" -m, --mask-reason", "include reason for package mask"),
+                (" -I, --exclude-installed", "exclude installed packages from output"),
+                (" -o, --overlay-tree", "list packages in overlays"),
+                (" -p, --portage-tree", "list packages in the main portage tree"),
+                (" -F, --format=TMPL", "specify a custom output format"),
+                ("              TMPL", "a format template using (see man page):"),
+            )
+        )
+    )
+    print(" " * 24, ", ".join(pp.emph(x) for x in FORMAT_TMPL_VARS))
 
 
 def get_duplicates(matches):
-	"""Return only packages that have more than one version installed."""
+    """Return only packages that have more than one version installed."""
 
-	dups = {}
-	result = []
-	for pkg in matches:
-		if pkg.cp in dups:
-			dups[pkg.cp].append(pkg)
-		else:
-			dups[pkg.cp] = [pkg]
+    dups = {}
+    result = []
+    for pkg in matches:
+        if pkg.cp in dups:
+            dups[pkg.cp].append(pkg)
+        else:
+            dups[pkg.cp] = [pkg]
 
-	for cpv in dups.values():
-		if len(cpv) > 1:
-			result.extend(cpv)
+    for cpv in dups.values():
+        if len(cpv) > 1:
+            result.extend(cpv)
 
-	return result
+    return result
 
 
 def get_binpkgs_missing(matches):
-	"""Return only packages that do not have a corresponding binary package."""
+    """Return only packages that do not have a corresponding binary package."""
 
-	result = []
-	binary_packages = set(get_bintree_cpvs())
-	matched_packages = set(x.cpv for x in matches)
-	missing_binary_packages = set(matched_packages.difference(binary_packages))
+    result = []
+    binary_packages = set(get_bintree_cpvs())
+    matched_packages = set(x.cpv for x in matches)
+    missing_binary_packages = set(matched_packages.difference(binary_packages))
 
-	for pkg in matches:
-		if pkg.cpv in missing_binary_packages:
-			result.append(pkg)
-	return result
+    for pkg in matches:
+        if pkg.cpv in missing_binary_packages:
+            result.append(pkg)
+    return result
 
 
 def parse_module_options(module_opts):
-	"""Parse module options and update QUERY_OPTS"""
-
-	opts = (x[0] for x in module_opts)
-	posargs = (x[1] for x in module_opts)
-	for opt, posarg in zip(opts, posargs):
-		if opt in ('-h', '--help'):
-			print_help()
-			sys.exit(0)
-		elif opt in ('-I', '--exclude-installed'):
-			QUERY_OPTS['in_installed'] = False
-		elif opt in ('-p', '--portage-tree'):
-			QUERY_OPTS['in_porttree'] = True
-		elif opt in ('-o', '--overlay-tree'):
-			QUERY_OPTS['in_overlay'] = True
-		elif opt in ('-f', '--full-regex'):
-			QUERY_OPTS['is_regex'] = True
-		elif opt in ('-m', '--mask-reason'):
-			QUERY_OPTS['include_mask_reason'] = True
-		elif opt in ('-e', '--exact-name'):
-			sys.stderr.write(pp.warn("-e, --exact-name is now default."))
-			sys.stderr.write(
-				pp.warn("Use globbing to simulate the old behavior.")
-			)
-			print()
-		elif opt in ('-d', '--duplicates'):
-			QUERY_OPTS['duplicates'] = True
-		elif opt in ('-b', '--binpkgs-missing'):
-			QUERY_OPTS['binpkgs-missing'] = True
-		elif opt in ('-F', '--format'):
-			QUERY_OPTS["package_format"] = posarg
+    """Parse module options and update QUERY_OPTS"""
+
+    opts = (x[0] for x in module_opts)
+    posargs = (x[1] for x in module_opts)
+    for opt, posarg in zip(opts, posargs):
+        if opt in ("-h", "--help"):
+            print_help()
+            sys.exit(0)
+        elif opt in ("-I", "--exclude-installed"):
+            QUERY_OPTS["in_installed"] = False
+        elif opt in ("-p", "--portage-tree"):
+            QUERY_OPTS["in_porttree"] = True
+        elif opt in ("-o", "--overlay-tree"):
+            QUERY_OPTS["in_overlay"] = True
+        elif opt in ("-f", "--full-regex"):
+            QUERY_OPTS["is_regex"] = True
+        elif opt in ("-m", "--mask-reason"):
+            QUERY_OPTS["include_mask_reason"] = True
+        elif opt in ("-e", "--exact-name"):
+            sys.stderr.write(pp.warn("-e, --exact-name is now default."))
+            sys.stderr.write(pp.warn("Use globbing to simulate the old behavior."))
+            print()
+        elif opt in ("-d", "--duplicates"):
+            QUERY_OPTS["duplicates"] = True
+        elif opt in ("-b", "--binpkgs-missing"):
+            QUERY_OPTS["binpkgs-missing"] = True
+        elif opt in ("-F", "--format"):
+            QUERY_OPTS["package_format"] = posarg
 
 
 def main(input_args):
-	"""Parse input and run the program"""
-
-	short_opts = "hdbefiImopF:" # -i, -e were options for default actions
-
-	# 04/09: djanderson
-	# --all is no longer needed. Kept for compatibility.
-	# --installed is no longer needed. Kept for compatibility.
-	# --exact-name is no longer needed. Kept for compatibility.
-	long_opts = ('help', 'all', 'installed', 'exclude-installed',
-		'mask-reason', 'portage-tree', 'overlay-tree', 'format=', 'full-regex',
-		'exact-name', 'duplicates', 'binpkgs-missing')
-
-	try:
-		module_opts, queries = gnu_getopt(input_args, short_opts, long_opts)
-	except GetoptError as err:
-		sys.stderr.write(pp.error("Module %s" % err))
-		print()
-		print_help(with_description=False)
-		sys.exit(2)
-
-	parse_module_options(module_opts)
-
-	# Only search installed packages when listing duplicate or missing binary packages
-	if QUERY_OPTS["duplicates"] or QUERY_OPTS["binpkgs-missing"]:
-		QUERY_OPTS["in_installed"] = True
-		QUERY_OPTS["in_porttree"] = False
-		QUERY_OPTS["in_overlay"] = False
-		QUERY_OPTS["include_mask_reason"] = False
-
-	if not queries:
-		print_help()
-		sys.exit(2)
-
-	first_run = True
-	for query in (Query(x, QUERY_OPTS['is_regex']) for x in queries):
-		if not first_run:
-			print()
-
-		# if we are in quiet mode, do not raise GentoolkitNoMatches exception
-		# instead we raise GentoolkitNonZeroExit to exit with an exit value of 3
-		try:
-			matches = query.smart_find(**QUERY_OPTS)
-		except errors.GentoolkitNoMatches:
-			if CONFIG['verbose']:
-				raise
-			else:
-				raise errors.GentoolkitNonZeroExit(3)
-
-		# Find duplicate packages
-		if QUERY_OPTS["duplicates"]:
-			matches = get_duplicates(matches)
-
-		# Find missing binary packages
-		if QUERY_OPTS["binpkgs-missing"]:
-			matches = get_binpkgs_missing(matches)
-
-		matches.sort()
-
-		#
-		# Output
-		#
-
-		for pkg in matches:
-			pkgstr = PackageFormatter(
-				pkg,
-				do_format=CONFIG['verbose'],
-				custom_format=QUERY_OPTS["package_format"]
-			)
-
-			if (QUERY_OPTS["in_porttree"] and
-				not QUERY_OPTS["in_overlay"]):
-				if not 'P' in pkgstr.location:
-					continue
-			if (QUERY_OPTS["in_overlay"] and
-				not QUERY_OPTS["in_porttree"]):
-				if not 'O' in pkgstr.location:
-					continue
-			pp.uprint(pkgstr)
-
-			if QUERY_OPTS["include_mask_reason"]:
-				ms_int, ms_orig = pkgstr.format_mask_status()
-				if ms_int < 3:
-					# ms_int is a number representation of mask level.
-					# Only 2 and above are "hard masked" and have reasons.
-					continue
-				mask_reason = pkg.mask_reason()
-				if not mask_reason:
-					# Package not on system or not masked
-					continue
-				elif not any(mask_reason):
-					print(" * No mask reason given")
-				else:
-					status = ', '.join(ms_orig)
-					explanation = mask_reason[0]
-					mask_location = mask_reason[1]
-					pp.uprint(" * Masked by %r" % status)
-					pp.uprint(" * %s:" % mask_location)
-					pp.uprint('\n'.join(
-						[' * %s' % line.lstrip(' #')
-							for line in explanation.splitlines()]
-						))
-
-		first_run = False
+    """Parse input and run the program"""
+
+    short_opts = "hdbefiImopF:"  # -i, -e were options for default actions
+
+    # 04/09: djanderson
+    # --all is no longer needed. Kept for compatibility.
+    # --installed is no longer needed. Kept for compatibility.
+    # --exact-name is no longer needed. Kept for compatibility.
+    long_opts = (
+        "help",
+        "all",
+        "installed",
+        "exclude-installed",
+        "mask-reason",
+        "portage-tree",
+        "overlay-tree",
+        "format=",
+        "full-regex",
+        "exact-name",
+        "duplicates",
+        "binpkgs-missing",
+    )
+
+    try:
+        module_opts, queries = gnu_getopt(input_args, short_opts, long_opts)
+    except GetoptError as err:
+        sys.stderr.write(pp.error("Module %s" % err))
+        print()
+        print_help(with_description=False)
+        sys.exit(2)
+
+    parse_module_options(module_opts)
+
+    # Only search installed packages when listing duplicate or missing binary packages
+    if QUERY_OPTS["duplicates"] or QUERY_OPTS["binpkgs-missing"]:
+        QUERY_OPTS["in_installed"] = True
+        QUERY_OPTS["in_porttree"] = False
+        QUERY_OPTS["in_overlay"] = False
+        QUERY_OPTS["include_mask_reason"] = False
+
+    if not queries:
+        print_help()
+        sys.exit(2)
+
+    first_run = True
+    for query in (Query(x, QUERY_OPTS["is_regex"]) for x in queries):
+        if not first_run:
+            print()
+
+        # if we are in quiet mode, do not raise GentoolkitNoMatches exception
+        # instead we raise GentoolkitNonZeroExit to exit with an exit value of 3
+        try:
+            matches = query.smart_find(**QUERY_OPTS)
+        except errors.GentoolkitNoMatches:
+            if CONFIG["verbose"]:
+                raise
+            else:
+                raise errors.GentoolkitNonZeroExit(3)
+
+        # Find duplicate packages
+        if QUERY_OPTS["duplicates"]:
+            matches = get_duplicates(matches)
+
+        # Find missing binary packages
+        if QUERY_OPTS["binpkgs-missing"]:
+            matches = get_binpkgs_missing(matches)
+
+        matches.sort()
+
+        #
+        # Output
+        #
+
+        for pkg in matches:
+            pkgstr = PackageFormatter(
+                pkg,
+                do_format=CONFIG["verbose"],
+                custom_format=QUERY_OPTS["package_format"],
+            )
+
+            if QUERY_OPTS["in_porttree"] and not QUERY_OPTS["in_overlay"]:
+                if not "P" in pkgstr.location:
+                    continue
+            if QUERY_OPTS["in_overlay"] and not QUERY_OPTS["in_porttree"]:
+                if not "O" in pkgstr.location:
+                    continue
+            pp.uprint(pkgstr)
+
+            if QUERY_OPTS["include_mask_reason"]:
+                ms_int, ms_orig = pkgstr.format_mask_status()
+                if ms_int < 3:
+                    # ms_int is a number representation of mask level.
+                    # Only 2 and above are "hard masked" and have reasons.
+                    continue
+                mask_reason = pkg.mask_reason()
+                if not mask_reason:
+                    # Package not on system or not masked
+                    continue
+                elif not any(mask_reason):
+                    print(" * No mask reason given")
+                else:
+                    status = ", ".join(ms_orig)
+                    explanation = mask_reason[0]
+                    mask_location = mask_reason[1]
+                    pp.uprint(" * Masked by %r" % status)
+                    pp.uprint(" * %s:" % mask_location)
+                    pp.uprint(
+                        "\n".join(
+                            [
+                                " * %s" % line.lstrip(" #")
+                                for line in explanation.splitlines()
+                            ]
+                        )
+                    )
+
+        first_run = False
+
 
 # vim: set ts=4 sw=4 tw=79: