| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-01 12:42:15 +0000 (Tue, 01 Jul 2008) |
| 3 |
New Revision: 10871 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/cache/metadata_overlay.py |
| 7 |
main/trunk/pym/portage/cache/sql_template.py |
| 8 |
Log: |
| 9 |
Py3k compatibility patch #2 by Ali Polatel <hawking@g.o>. |
| 10 |
Replace dict.has_key() calls with "in" and "not in" operators. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/cache/metadata_overlay.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/cache/metadata_overlay.py 2008-07-01 12:38:49 UTC (rev 10870) |
| 16 |
+++ main/trunk/pym/portage/cache/metadata_overlay.py 2008-07-01 12:42:15 UTC (rev 10871) |
| 17 |
@@ -61,7 +61,7 @@ |
| 18 |
|
| 19 |
def _delitem(self, cpv): |
| 20 |
value = self[cpv] # validates whiteout and/or raises a KeyError when necessary |
| 21 |
- if self.db_ro.has_key(cpv): |
| 22 |
+ if cpv in self.db_ro: |
| 23 |
self.db_rw[cpv] = self._create_whiteout(value) |
| 24 |
else: |
| 25 |
del self.db_rw[cpv] |
| 26 |
|
| 27 |
Modified: main/trunk/pym/portage/cache/sql_template.py |
| 28 |
=================================================================== |
| 29 |
--- main/trunk/pym/portage/cache/sql_template.py 2008-07-01 12:38:49 UTC (rev 10870) |
| 30 |
+++ main/trunk/pym/portage/cache/sql_template.py 2008-07-01 12:42:15 UTC (rev 10871) |
| 31 |
@@ -150,7 +150,7 @@ |
| 32 |
# so we store only what's handed to us and is a known key |
| 33 |
db_values = [] |
| 34 |
for key in self._known_keys: |
| 35 |
- if values.has_key(key) and values[key] != '': |
| 36 |
+ if key in values and values[key]: |
| 37 |
db_values.append({"key":key, "value":values[key]}) |
| 38 |
|
| 39 |
if len(db_values) > 0: |
| 40 |
|
| 41 |
-- |
| 42 |
gentoo-commits@l.g.o mailing list |
Archives