diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-01 12:42:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-01 12:42:15 +0000 |
| commit | ff5c09fb29db5910308628aa06d2ffe368c7264a (patch) | |
| tree | cad28c46fc47dfd7f8175c4fba3c62f2a4b5e7bd | |
| parent | 83499617458a93217e8f1ed5194c16f2b3bedc40 (diff) | |
| download | portage-ff5c09fb29db5910308628aa06d2ffe368c7264a.tar.gz portage-ff5c09fb29db5910308628aa06d2ffe368c7264a.tar.bz2 portage-ff5c09fb29db5910308628aa06d2ffe368c7264a.zip | |
Py3k compatibility patch #2 by Ali Polatel <hawking@g.o>.
Replace dict.has_key() calls with "in" and "not in" operators.
svn path=/main/trunk/; revision=10871
| -rw-r--r-- | pym/portage/cache/metadata_overlay.py | 2 | ||||
| -rw-r--r-- | pym/portage/cache/sql_template.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py index 13d12787e..e25759c4a 100644 --- a/pym/portage/cache/metadata_overlay.py +++ b/pym/portage/cache/metadata_overlay.py @@ -61,7 +61,7 @@ class database(template.database): def _delitem(self, cpv): value = self[cpv] # validates whiteout and/or raises a KeyError when necessary - if self.db_ro.has_key(cpv): + if cpv in self.db_ro: self.db_rw[cpv] = self._create_whiteout(value) else: del self.db_rw[cpv] diff --git a/pym/portage/cache/sql_template.py b/pym/portage/cache/sql_template.py index f32a72844..196039c74 100644 --- a/pym/portage/cache/sql_template.py +++ b/pym/portage/cache/sql_template.py @@ -150,7 +150,7 @@ class SQLDatabase(template.database): # so we store only what's handed to us and is a known key db_values = [] for key in self._known_keys: - if values.has_key(key) and values[key] != '': + if key in values and values[key]: db_values.append({"key":key, "value":values[key]}) if len(db_values) > 0: |