1 |
Author: zmedico |
2 |
Date: 2009-03-22 23:21:38 +0000 (Sun, 22 Mar 2009) |
3 |
New Revision: 13145 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/__init__.py |
7 |
Log: |
8 |
Replace xrange() usage with normal iteration and enumerate() where |
9 |
appropriate. Thanks to Douglass Anderson <dja@××××××.com> for the |
10 |
initial patch. |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/portage/__init__.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/portage/__init__.py 2009-03-22 22:05:47 UTC (rev 13144) |
16 |
+++ main/trunk/pym/portage/__init__.py 2009-03-22 23:21:38 UTC (rev 13145) |
17 |
@@ -1376,9 +1376,9 @@ |
18 |
self.pusemask_list = [] |
19 |
rawpusemask = [grabdict_package(os.path.join(x, "package.use.mask"), |
20 |
recursive=1) for x in self.profiles] |
21 |
- for i in xrange(len(self.profiles)): |
22 |
+ for pusemaskdict in rawpusemask: |
23 |
cpdict = {} |
24 |
- for k, v in rawpusemask[i].iteritems(): |
25 |
+ for k, v in pusemaskdict.iteritems(): |
26 |
cpdict.setdefault(dep_getkey(k), {})[k] = v |
27 |
self.pusemask_list.append(cpdict) |
28 |
del rawpusemask |
29 |
@@ -1386,9 +1386,9 @@ |
30 |
self.pkgprofileuse = [] |
31 |
rawprofileuse = [grabdict_package(os.path.join(x, "package.use"), |
32 |
juststrings=True, recursive=1) for x in self.profiles] |
33 |
- for i in xrange(len(self.profiles)): |
34 |
+ for rawpusedict in rawprofileuse: |
35 |
cpdict = {} |
36 |
- for k, v in rawprofileuse[i].iteritems(): |
37 |
+ for k, v in rawpusedict.iteritems(): |
38 |
cpdict.setdefault(dep_getkey(k), {})[k] = v |
39 |
self.pkgprofileuse.append(cpdict) |
40 |
del rawprofileuse |
41 |
@@ -1402,9 +1402,9 @@ |
42 |
rawpuseforce = [grabdict_package( |
43 |
os.path.join(x, "package.use.force"), recursive=1) \ |
44 |
for x in self.profiles] |
45 |
- for i in xrange(len(self.profiles)): |
46 |
+ for rawpusefdict in rawpuseforce: |
47 |
cpdict = {} |
48 |
- for k, v in rawpuseforce[i].iteritems(): |
49 |
+ for k, v in rawpusefdict.iteritems(): |
50 |
cpdict.setdefault(dep_getkey(k), {})[k] = v |
51 |
self.puseforce_list.append(cpdict) |
52 |
del rawpuseforce |
53 |
@@ -2129,10 +2129,11 @@ |
54 |
if pkginternaluse != self.configdict["pkginternal"].get("USE", ""): |
55 |
self.configdict["pkginternal"]["USE"] = pkginternaluse |
56 |
has_changed = True |
57 |
+ |
58 |
defaults = [] |
59 |
pos = 0 |
60 |
- for i in xrange(len(self.profiles)): |
61 |
- cpdict = self.pkgprofileuse[i].get(cp, None) |
62 |
+ for i, pkgprofileuse_dict in enumerate(self.pkgprofileuse): |
63 |
+ cpdict = pkgprofileuse_dict.get(cp) |
64 |
if cpdict: |
65 |
keys = cpdict.keys() |
66 |
while keys: |
67 |
@@ -2296,8 +2297,8 @@ |
68 |
cp = dep_getkey(pkg) |
69 |
usemask = [] |
70 |
pos = 0 |
71 |
- for i in xrange(len(self.profiles)): |
72 |
- cpdict = self.pusemask_list[i].get(cp, None) |
73 |
+ for i, pusemask_dict in enumerate(self.pusemask_list): |
74 |
+ cpdict = pusemask_dict.get(cp) |
75 |
if cpdict: |
76 |
keys = cpdict.keys() |
77 |
while keys: |
78 |
@@ -2319,8 +2320,8 @@ |
79 |
cp = dep_getkey(pkg) |
80 |
useforce = [] |
81 |
pos = 0 |
82 |
- for i in xrange(len(self.profiles)): |
83 |
- cpdict = self.puseforce_list[i].get(cp, None) |
84 |
+ for i, puseforce_dict in enumerate(self.puseforce_list): |
85 |
+ cpdict = puseforce_dict.get(cp) |
86 |
if cpdict: |
87 |
keys = cpdict.keys() |
88 |
while keys: |
89 |
@@ -2395,8 +2396,8 @@ |
90 |
pkg = "%s:%s" % (cpv, metadata["SLOT"]) |
91 |
keywords = [[x for x in metadata["KEYWORDS"].split() if x != "-*"]] |
92 |
pos = len(keywords) |
93 |
- for i in xrange(len(self.profiles)): |
94 |
- cpdict = self._pkeywords_list[i].get(cp, None) |
95 |
+ for pkeywords_dict in self._pkeywords_list: |
96 |
+ cpdict = pkeywords_dict.get(cp) |
97 |
if cpdict: |
98 |
keys = list(cpdict) |
99 |
while keys: |