diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-01 12:38:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-01 12:38:49 +0000 |
| commit | 83499617458a93217e8f1ed5194c16f2b3bedc40 (patch) | |
| tree | 3337cac977a844506cc7ac03fa046a65ec130c9b /pym/_emerge | |
| parent | 3ab46b943befdd480b24c3d459555011dd04e120 (diff) | |
| download | portage-83499617458a93217e8f1ed5194c16f2b3bedc40.tar.gz portage-83499617458a93217e8f1ed5194c16f2b3bedc40.tar.bz2 portage-83499617458a93217e8f1ed5194c16f2b3bedc40.zip | |
Py3k compatibility patch #1 by Ali Polatel <hawking@g.o>.
Replace dict.has_key() calls with "in" and "not in" operators..
svn path=/main/trunk/; revision=10870
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 51bb2fddc..e2cb01a29 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7299,7 +7299,7 @@ class Scheduler(object): emergelog(xterm_titles, " *** Finished. Cleaning up...") # We're out of the loop... We're done. Delete the resume data. - if mtimedb.has_key("resume"): + if "resume" in mtimedb: del mtimedb["resume"] mtimedb.commit() @@ -7537,7 +7537,7 @@ def unmerge(root_config, myopts, unmerge_action, # since we're pruning, we don't care about slots # and put all the pkgs in together myslot = 0 - if not slotmap.has_key(myslot): + if myslot not in slotmap: slotmap[myslot] = {} slotmap[myslot][localtree.dbapi.cpv_counter(mypkg)] = mypkg @@ -8241,7 +8241,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): rsync_initial_timeout = 15 try: - if settings.has_key("RSYNC_RETRIES"): + if "RSYNC_RETRIES" in settings: print yellow("WARNING:")+" usage of RSYNC_RETRIES is deprecated, use PORTAGE_RSYNC_RETRIES instead" maxretries=int(settings["RSYNC_RETRIES"]) else: |