diff options
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/actions.py | 2 | ||||
-rw-r--r-- | pym/_emerge/countdown.py | 2 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 12 | ||||
-rw-r--r-- | pym/_emerge/getloadavg.py | 2 | ||||
-rw-r--r-- | pym/_emerge/main.py | 2 | ||||
-rw-r--r-- | pym/_emerge/unmerge.py | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 5ac427d9f..5c351a092 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1148,7 +1148,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, ignore_priority_range = [None] ignore_priority_range.extend( - xrange(UnmergeDepPriority.MIN, UnmergeDepPriority.MAX + 1)) + range(UnmergeDepPriority.MIN, UnmergeDepPriority.MAX + 1)) while not graph.empty(): for ignore_priority in ignore_priority_range: nodes = graph.root_nodes(ignore_priority=ignore_priority) diff --git a/pym/_emerge/countdown.py b/pym/_emerge/countdown.py index 12c3e2c07..efb648c76 100644 --- a/pym/_emerge/countdown.py +++ b/pym/_emerge/countdown.py @@ -13,7 +13,7 @@ def countdown(secs=5, doing="Starting"): if secs: print(">>> Waiting",secs,"seconds before starting...") print(">>> (Control-C to abort)...\n"+doing+" in: ", end=' ') - ticks=range(secs) + ticks=list(range(secs)) ticks.reverse() for sec in ticks: sys.stdout.write(colorize("UNMERGE_WARN", str(sec+1)+" ")) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index af609a0e4..4954c1a3e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1830,11 +1830,11 @@ class depgraph(object): # If two packages conflict, discard the lower version. discard_pkgs = set() greedy_pkgs.sort(reverse=True) - for i in xrange(len(greedy_pkgs) - 1): + for i in range(len(greedy_pkgs) - 1): pkg1 = greedy_pkgs[i] if pkg1 in discard_pkgs: continue - for j in xrange(i + 1, len(greedy_pkgs)): + for j in range(i + 1, len(greedy_pkgs)): pkg2 = greedy_pkgs[j] if pkg2 in discard_pkgs: continue @@ -3148,7 +3148,7 @@ class depgraph(object): break if not selected_nodes and \ not (prefer_asap and asap_nodes): - for i in xrange(priority_range.NONE, + for i in range(priority_range.NONE, priority_range.MEDIUM_SOFT + 1): ignore_priority = priority_range.ignore_priority[i] nodes = get_nodes(ignore_priority=ignore_priority) @@ -3194,7 +3194,7 @@ class depgraph(object): mergeable_nodes = set(nodes) if prefer_asap and asap_nodes: nodes = asap_nodes - for i in xrange(priority_range.SOFT, + for i in range(priority_range.SOFT, priority_range.MEDIUM_SOFT + 1): ignore_priority = priority_range.ignore_priority[i] for node in nodes: @@ -3930,7 +3930,7 @@ class depgraph(object): mylist.append((x, 0, True)) last_merge_depth = 0 - for i in xrange(len(mylist)-1,-1,-1): + for i in range(len(mylist)-1,-1,-1): graph_key, depth, ordered = mylist[i] if not ordered and depth == 0 and i > 0 \ and graph_key == mylist[i-1][0] and \ @@ -3955,7 +3955,7 @@ class depgraph(object): # and disable the entire repo display in this case. repoadd_set = set() - for mylist_index in xrange(len(mylist)): + for mylist_index in range(len(mylist)): x, depth, ordered = mylist[mylist_index] pkg_type = x[0] myroot = x[1] diff --git a/pym/_emerge/getloadavg.py b/pym/_emerge/getloadavg.py index d252e8c0a..5ff0890cd 100644 --- a/pym/_emerge/getloadavg.py +++ b/pym/_emerge/getloadavg.py @@ -20,7 +20,7 @@ if getloadavg is None: if len(loadavg_split) < 3: raise OSError('unknown') loadavg_floats = [] - for i in xrange(3): + for i in range(3): try: loadavg_floats.append(float(loadavg_split[i])) except ValueError: diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 2ed7667ef..9a101803f 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -770,7 +770,7 @@ def parse_opts(tmpcmdline, silent=False): myaction = 'deselect' if myargs and not isinstance(myargs[0], unicode): - for i in xrange(len(myargs)): + for i in range(len(myargs)): myargs[i] = portage._unicode_decode(myargs[i]) myfiles += myargs diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 2ea77ab3b..710a57b28 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -305,7 +305,7 @@ def unmerge(root_config, myopts, unmerge_action, # listed in "world" as they would be remerged on the next update of "world" or the # relevant package sets. unknown_sets = set() - for cp in xrange(len(pkgmap)): + for cp in range(len(pkgmap)): for cpv in pkgmap[cp]["selected"].copy(): try: pkg = _pkg(cpv) @@ -415,7 +415,7 @@ def unmerge(root_config, myopts, unmerge_action, cp_dict[k].update(v) pkgmap = [unordered[cp] for cp in sorted(unordered)] - for x in xrange(len(pkgmap)): + for x in range(len(pkgmap)): selected = pkgmap[x]["selected"] if not selected: continue @@ -493,7 +493,7 @@ def unmerge(root_config, myopts, unmerge_action, if clean_delay and not autoclean: countdown(int(settings["CLEAN_DELAY"]), ">>> Unmerging") - for x in xrange(len(pkgmap)): + for x in range(len(pkgmap)): for y in pkgmap[x]["selected"]: writemsg_level(">>> Unmerging "+y+"...\n", noiselevel=-1) emergelog(xterm_titles, "=== Unmerging... ("+y+")") |