diff options
| -rwxr-xr-x | bin/egencache | 4 | ||||
| -rwxr-xr-x | bin/emaint | 2 | ||||
| -rwxr-xr-x | bin/glsa-check | 4 | ||||
| -rwxr-xr-x | bin/repoman | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bin/egencache b/bin/egencache index b160189a3..69a41fde6 100755 --- a/bin/egencache +++ b/bin/egencache @@ -204,7 +204,7 @@ class GenCache(object): dead_nodes = set() if self._global_cleanse: try: - for cpv in trg_cache.keys(): + for cpv in trg_cache: cp = cpv_getkey(cpv) if cp is None: self.returncode |= 1 @@ -224,7 +224,7 @@ class GenCache(object): else: cp_set = self._cp_set try: - for cpv in trg_cache.keys(): + for cpv in trg_cache: cp = cpv_getkey(cpv) if cp is None: self.returncode |= 1 diff --git a/bin/emaint b/bin/emaint index 611c323da..7aac5d49a 100755 --- a/bin/emaint +++ b/bin/emaint @@ -475,7 +475,7 @@ def emaint_main(myargv): "cleanresume":CleanResume } - module_names = list(modules.keys()) + module_names = list(modules) module_names.sort() module_names.insert(0, "all") diff --git a/bin/glsa-check b/bin/glsa-check index 787cf39db..19f451c59 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -172,12 +172,12 @@ def summarylist(myglsalist, fd1=sys.stdout, fd2=sys.stderr): fd1.write(color(myglsa.nr) + " " + color(status) + " " + color(access) + myglsa.title + " (") if not verbose: - for pkg in list(myglsa.packages.keys())[:3]: + for pkg in list(myglsa.packages)[:3]: fd1.write(" " + pkg + " ") if len(myglsa.packages) > 3: fd1.write("... ") else: - for pkg in myglsa.packages.keys(): + for pkg in myglsa.packages: mylist = vardb.match(portage.dep_getkey(str(pkg))) if len(mylist) > 0: pkg = color(" ".join(mylist)) diff --git a/bin/repoman b/bin/repoman index 950226206..edec13501 100755 --- a/bin/repoman +++ b/bin/repoman @@ -153,7 +153,7 @@ def ParseArgs(args, qahelp): 'scan' : 'Scan directory tree for QA issues' } - mode_keys = list(modes.keys()) + mode_keys = list(modes) mode_keys.sort() parser = RepomanOptionParser(formatter=RepomanHelpFormatter(), usage="%prog [options] [mode]") @@ -198,7 +198,7 @@ def ParseArgs(args, qahelp): parser.add_option('--without-mask', dest='without_mask', action='store_true', default=False, help='behave as if no package.mask entries exist (not allowed with commit mode)') - parser.add_option('--mode', type='choice', dest='mode', choices=list(modes.keys()), + parser.add_option('--mode', type='choice', dest='mode', choices=list(modes), help='specify which mode repoman will run in (default=full)') parser.on_tail("\n " + green("Modes".ljust(20) + " Description\n")) @@ -208,7 +208,7 @@ def ParseArgs(args, qahelp): parser.on_tail("\n " + green("QA keyword".ljust(20) + " Description\n")) - sorted_qa = list(qahelp.keys()) + sorted_qa = list(qahelp) sorted_qa.sort() for k in sorted_qa: parser.on_tail(" %s %s\n" % (k.ljust(20), qahelp[k])) @@ -330,7 +330,7 @@ qahelp={ "upstream.workaround":"The ebuild works around an upstream bug, an upstream bug should be filed and tracked in bugs.gentoo.org" } -qacats = list(qahelp.keys()) +qacats = list(qahelp) qacats.sort() qawarnings = set(( |