sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8 cleanup: don't use has_key()

Browse Source 
has_key() has been deprecated for quite some time now.

Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
This commit is contained in:
Sascha Silbe
2010-10-15 18:18:15 +00:00
parent 4d978fda14
commit 814ab2ddf9
6 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sugar/activity/activity.py
+4 -6
View File
@@ -256,7 +256,7 @@ class Activity(Window, gtk.Container):
"""
Window.__init__(self)
if os.environ.has_key('SUGAR_ACTIVITY_ROOT'):
if 'SUGAR_ACTIVITY_ROOT' in os.environ:
# If this activity runs inside Sugar, we want it to take all the
# screen. Would be better if it was the shell to do this, but we
# haven't found yet a good way to do it there. See #1263.
@@ -307,7 +307,7 @@ class Activity(Window, gtk.Container):
self._jobject = datastore.get(handle.object_id)
self.set_title(self._jobject.metadata['title'])
if self._jobject.metadata.has_key('share-scope'):
if 'share-scope' in self._jobject.metadata:
share_scope = self._jobject.metadata['share-scope']
self.shared_activity = None
@@ -509,8 +509,7 @@ class Activity(Window, gtk.Container):
which isn't specific to a journal item here. If (meta-)data is in
anyway specific to a journal entry, it MUST be stored in the DataStore.
"""
if os.environ.has_key('SUGAR_ACTIVITY_ROOT') and \
os.environ['SUGAR_ACTIVITY_ROOT']:
if os.environ.get('SUGAR_ACTIVITY_ROOT'):
return os.environ['SUGAR_ACTIVITY_ROOT']
else:
return '/'
@@ -974,8 +973,7 @@ def get_bundle_path():
def get_activity_root():
"""Returns a path for saving Activity specific preferences, etc."""
if os.environ.has_key('SUGAR_ACTIVITY_ROOT') and \
os.environ['SUGAR_ACTIVITY_ROOT']:
if os.environ.get('SUGAR_ACTIVITY_ROOT'):
return os.environ['SUGAR_ACTIVITY_ROOT']
else:
raise RuntimeError("No SUGAR_ACTIVITY_ROOT set.")
src/sugar/activity/namingalert.py
+1 -2
View File
@@ -271,8 +271,7 @@ class NamingAlert(gtk.Window):
activity_bundle = ActivityBundle(self._bundle_path)
file_name = activity_bundle.get_icon()
entry_icon = CanvasIcon(file_name=file_name)
if self._activity.metadata.has_key('icon-color') and \
self._activity.metadata['icon-color']:
if self._activity.metadata.get('icon-color'):
entry_icon.props.xo_color = XoColor( \
self._activity.metadata['icon-color'])
return entry_icon