From c44296092e19dd1cdbbbff1245b409b67419d60f Mon Sep 17 00:00:00 2001 From: Sascha Silbe Date: Sat, 16 Oct 2010 17:23:22 +0000 Subject: [PATCH] PEP8 cleanup: don't use has_key() has_key() has been deprecated for quite some time now. Reviewed-by: James Cameron Reviewed-by: Simon Schampijer CC: Aleksey Lim --- src/jarabe/desktop/meshbox.py | 2 +- src/jarabe/frame/friendstray.py | 4 ++-- src/jarabe/journal/expandedentry.py | 7 ++----- src/jarabe/journal/journalentrybundle.py | 2 +- src/jarabe/journal/misc.py | 9 +++++---- src/jarabe/journal/palettes.py | 2 +- src/jarabe/model/bundleregistry.py | 5 +---- src/jarabe/model/friends.py | 2 +- src/jarabe/model/session.py | 2 +- 9 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 6d35f46520..50b8a3f8c8 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -119,7 +119,7 @@ def _create_palette(self): return p def has_buddy_icon(self, key): - return self._icons.has_key(key) + return key in self._icons def __buddy_added_cb(self, activity, buddy): self._add_buddy(buddy) diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py index b387e063dd..31a98091e7 100644 --- a/src/jarabe/frame/friendstray.py +++ b/src/jarabe/frame/friendstray.py @@ -50,7 +50,7 @@ def __init__(self): self.__neighborhood_activity_added_cb) def add_buddy(self, buddy): - if self._buddies.has_key(buddy.props.key): + if buddy.props.key in self._buddies: return icon = FriendIcon(buddy) @@ -60,7 +60,7 @@ def add_buddy(self, buddy): self._buddies[buddy.props.key] = icon def remove_buddy(self, buddy): - if not self._buddies.has_key(buddy.props.key): + if buddy.props.key not in self._buddies: return self.remove_item(self._buddies[buddy.props.key]) diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index 9271313131..0c606005c5 100644 --- a/src/jarabe/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -212,9 +212,7 @@ def _create_preview(self): height = style.zoom(240) box = hippo.CanvasBox() - if self._metadata.has_key('preview') and \ - len(self._metadata['preview']) > 4: - + if len(self._metadata.get('preview', '')) > 4: if self._metadata['preview'][1:4] == 'PNG': preview_data = self._metadata['preview'] else: @@ -304,8 +302,7 @@ def _create_buddy_list(self): vbox.append(text) - if self._metadata.has_key('buddies') and \ - self._metadata['buddies']: + if self._metadata.get('buddies'): buddies = simplejson.loads(self._metadata['buddies']).values() vbox.append(BuddyList(buddies)) return vbox diff --git a/src/jarabe/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py index 9ce676ed85..c220c09188 100644 --- a/src/jarabe/journal/journalentrybundle.py +++ b/src/jarabe/journal/journalentrybundle.py @@ -42,7 +42,7 @@ def __init__(self, path): Bundle.__init__(self, path) def install(self, uid=''): - if os.environ.has_key('SUGAR_ACTIVITY_ROOT'): + if 'SUGAR_ACTIVITY_ROOT' in os.environ: install_dir = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'], 'data') else: diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py index 7d91cbbe4a..f3236766a9 100644 --- a/src/jarabe/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -89,14 +89,15 @@ def get_icon_name(metadata): def get_date(metadata): """ Convert from a string in iso format to a more human-like format. """ - if metadata.has_key('timestamp'): + if 'timestamp' in metadata: timestamp = float(metadata['timestamp']) return util.timestamp_to_elapsed_string(timestamp) - elif metadata.has_key('mtime'): + + if 'mtime' in metadata: ti = time.strptime(metadata['mtime'], "%Y-%m-%dT%H:%M:%S") return util.timestamp_to_elapsed_string(time.mktime(ti)) - else: - return _('No date') + + return _('No date') def get_bundle(metadata): diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index d3415066e4..631abc6b49 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -54,7 +54,7 @@ def __init__(self, metadata, detail=False): activity_icon.props.file = misc.get_icon_name(metadata) activity_icon.props.xo_color = misc.get_icon_color(metadata) - if metadata.has_key('title'): + if 'title' in metadata: title = gobject.markup_escape_text(metadata['title']) else: title = _('Untitled') diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py index afecf9c70c..c3419cb866 100644 --- a/src/jarabe/model/bundleregistry.py +++ b/src/jarabe/model/bundleregistry.py @@ -292,10 +292,7 @@ def get_activities_for_type(self, mime_type): return result def get_default_for_type(self, mime_type): - if self._mime_defaults.has_key(mime_type): - return self._mime_defaults[mime_type] - else: - return None + return self._mime_defaults.get(mime_type) def _find_bundle(self, bundle_id, version): for bundle in self._bundles: diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py index bad6eed03d..f2815bd623 100644 --- a/src/jarabe/model/friends.py +++ b/src/jarabe/model/friends.py @@ -109,7 +109,7 @@ def __init__(self): self.load() def has_buddy(self, buddy): - return self._friends.has_key(buddy.get_key()) + return buddy.get_key() in self._friends def add_friend(self, buddy_info): self._friends[buddy_info.get_key()] = buddy_info diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index f5c2655b39..c6409fb6b2 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -75,7 +75,7 @@ def shutdown_completed(self): def _close_emulator(self): gtk.main_quit() - if os.environ.has_key('SUGAR_EMULATOR_PID'): + if 'SUGAR_EMULATOR_PID' in os.environ: pid = int(os.environ['SUGAR_EMULATOR_PID']) os.kill(pid, signal.SIGTERM)