| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-29 22:34:11 +0000 (Thu, 29 May 2008) |
| 3 |
New Revision: 10485 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Use izip() to eliminate temporary dict instances. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-29 21:34:51 UTC (rev 10484) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-29 22:34:11 UTC (rev 10485) |
| 15 |
@@ -500,8 +500,8 @@ |
| 16 |
else: |
| 17 |
db_keys = list(db._aux_cache_keys) |
| 18 |
for cpv in db.match(atom): |
| 19 |
- metadata = dict(izip(db_keys, |
| 20 |
- db.aux_get(cpv, db_keys))) |
| 21 |
+ metadata = izip(db_keys, |
| 22 |
+ db.aux_get(cpv, db_keys)) |
| 23 |
if not self._visible(db, cpv, metadata): |
| 24 |
continue |
| 25 |
matches.add(cpv) |
| 26 |
@@ -523,8 +523,8 @@ |
| 27 |
for cpv in reversed(db.match(atom)): |
| 28 |
if portage.cpv_getkey(cpv) != cp: |
| 29 |
continue |
| 30 |
- metadata = dict(izip(db_keys, |
| 31 |
- db.aux_get(cpv, db_keys))) |
| 32 |
+ metadata = izip(db_keys, |
| 33 |
+ db.aux_get(cpv, db_keys)) |
| 34 |
if not self._visible(db, cpv, metadata): |
| 35 |
continue |
| 36 |
if not result or cpv == portage.best([cpv, result]): |
| 37 |
@@ -744,6 +744,7 @@ |
| 38 |
be greedy with respect to slots. Unslotted system packages will not be |
| 39 |
stored in world.""" |
| 40 |
pkg = Package(cpv=pkg_key, root_config=root_config, metadata=metadata) |
| 41 |
+ metadata = pkg.metadata |
| 42 |
arg_atom = args_set.findAtomForPackage(pkg) |
| 43 |
if not arg_atom: |
| 44 |
return None |
| 45 |
@@ -2542,8 +2543,8 @@ |
| 46 |
os.path.realpath(self.trees[myroot]["bintree"].getname(mykey)): |
| 47 |
print colorize("BAD", "\n*** You need to adjust PKGDIR to emerge this package.\n") |
| 48 |
return 0, myfavorites |
| 49 |
- metadata = dict(izip(self._mydbapi_keys, |
| 50 |
- bindb.aux_get(mykey, self._mydbapi_keys))) |
| 51 |
+ metadata = izip(self._mydbapi_keys, |
| 52 |
+ bindb.aux_get(mykey, self._mydbapi_keys)) |
| 53 |
pkg = Package(type_name="binary", root_config=root_config, |
| 54 |
cpv=mykey, built=True, metadata=metadata, |
| 55 |
onlydeps=onlydeps) |
| 56 |
@@ -2580,12 +2581,12 @@ |
| 57 |
else: |
| 58 |
raise portage.exception.PackageNotFound( |
| 59 |
"%s is not in a valid portage tree hierarchy or does not exist" % x) |
| 60 |
- metadata = dict(izip(self._mydbapi_keys, |
| 61 |
- portdb.aux_get(mykey, self._mydbapi_keys))) |
| 62 |
- pkgsettings.setcpv(mykey, mydb=metadata) |
| 63 |
- metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 64 |
+ metadata = izip(self._mydbapi_keys, |
| 65 |
+ portdb.aux_get(mykey, self._mydbapi_keys)) |
| 66 |
pkg = Package(type_name="ebuild", root_config=root_config, |
| 67 |
cpv=mykey, metadata=metadata, onlydeps=onlydeps) |
| 68 |
+ pkgsettings.setcpv(pkg) |
| 69 |
+ pkg.metadata["USE"] = pkgsettings["PORTAGE_USE"] |
| 70 |
self._pkg_cache[pkg] = pkg |
| 71 |
args.append(PackageArg(arg=x, package=pkg, |
| 72 |
root_config=root_config)) |
| 73 |
@@ -3116,7 +3117,7 @@ |
| 74 |
if pkg is None: |
| 75 |
calculated_use = False |
| 76 |
try: |
| 77 |
- metadata = zip(self._mydbapi_keys, |
| 78 |
+ metadata = izip(self._mydbapi_keys, |
| 79 |
db.aux_get(cpv, self._mydbapi_keys)) |
| 80 |
except KeyError: |
| 81 |
continue |
| 82 |
@@ -5228,8 +5229,8 @@ |
| 83 |
pkg_type, root, pkg_key, pkg_status = x |
| 84 |
if pkg_status != "nomerge": |
| 85 |
continue |
| 86 |
- metadata = dict(izip(self._mydbapi_keys, |
| 87 |
- self.mydbapi[root].aux_get(pkg_key, self._mydbapi_keys))) |
| 88 |
+ metadata = izip(self._mydbapi_keys, |
| 89 |
+ self.mydbapi[root].aux_get(pkg_key, self._mydbapi_keys)) |
| 90 |
try: |
| 91 |
myfavkey = create_world_atom(pkg_key, metadata, |
| 92 |
args_set, root_config) |
| 93 |
@@ -5286,7 +5287,7 @@ |
| 94 |
continue |
| 95 |
mydb = trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
| 96 |
try: |
| 97 |
- metadata = zip(self._mydbapi_keys, |
| 98 |
+ metadata = izip(self._mydbapi_keys, |
| 99 |
mydb.aux_get(pkg_key, self._mydbapi_keys)) |
| 100 |
except KeyError: |
| 101 |
# It does no exist or it is corrupt. |
| 102 |
@@ -8022,11 +8023,11 @@ |
| 103 |
continue |
| 104 |
spinner.update() |
| 105 |
fakedb.cpv_inject(pkg) |
| 106 |
- myaux = dict(izip(aux_keys, vardb.aux_get(pkg, aux_keys))) |
| 107 |
+ myaux = izip(aux_keys, vardb.aux_get(pkg, aux_keys)) |
| 108 |
mydeps = [] |
| 109 |
|
| 110 |
usedef = vardb.aux_get(pkg, ["USE"])[0].split() |
| 111 |
- for dep_type, depstr in myaux.iteritems(): |
| 112 |
+ for dep_type, depstr in myaux: |
| 113 |
|
| 114 |
if not depstr: |
| 115 |
continue |
| 116 |
@@ -8157,10 +8158,10 @@ |
| 117 |
del cleanlist[:] |
| 118 |
for node in clean_set: |
| 119 |
graph.add(node, None) |
| 120 |
- myaux = dict(izip(aux_keys, vardb.aux_get(node, aux_keys))) |
| 121 |
+ myaux = izip(aux_keys, vardb.aux_get(node, aux_keys)) |
| 122 |
mydeps = [] |
| 123 |
usedef = vardb.aux_get(node, ["USE"])[0].split() |
| 124 |
- for dep_type, depstr in myaux.iteritems(): |
| 125 |
+ for dep_type, depstr in myaux: |
| 126 |
if not depstr: |
| 127 |
continue |
| 128 |
try: |
| 129 |
|
| 130 |
-- |
| 131 |
gentoo-commits@l.g.o mailing list |
Archives