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