diff --git a/src/sugar/activity/activityhandle.py b/src/sugar/activity/activityhandle.py
index 4aeac71f..b29973e2 100644
--- a/src/sugar/activity/activityhandle.py
+++ b/src/sugar/activity/activityhandle.py
@@ -69,7 +69,7 @@ class ActivityHandle(object):
 def create_from_dict(handle_dict):
     """Create a handle from a dictionary of parameters"""
     result = ActivityHandle(handle_dict['activity_id'],
-        object_id = handle_dict.get('object_id'),
-        uri = handle_dict.get('uri'),
-        invited = handle_dict.get('invited'))
+        object_id=handle_dict.get('object_id'),
+        uri=handle_dict.get('uri'),
+        invited=handle_dict.get('invited'))
     return result
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
index c0ea7dd3..d67077f9 100644
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar/activity/bundlebuilder.py
@@ -64,7 +64,7 @@ def list_files(base_dir, ignore_dirs=None, ignore_files=None):
 
 class Config(object):
 
-    def __init__(self, source_dir=None, dist_dir = None, dist_name = None):
+    def __init__(self, source_dir=None, dist_dir=None, dist_name=None):
         self.source_dir = source_dir or os.getcwd()
         self.dist_dir = dist_dir or os.path.join(self.source_dir, 'dist')
         self.dist_name = dist_name
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index 482b31b8..ff29f054 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
@@ -136,7 +136,7 @@ class ActivityBundle(Bundle):
 
         return lines
 
-    def get_files(self, manifest = None):
+    def get_files(self, manifest=None):
         files = [line for line in (manifest or self.manifest) if line]
 
         if self.is_file('MANIFEST'):
diff --git a/src/sugar/graphics/tray.py b/src/sugar/graphics/tray.py
index 172123a8..0e048d8f 100644
--- a/src/sugar/graphics/tray.py
+++ b/src/sugar/graphics/tray.py
@@ -170,7 +170,7 @@ class _TrayScrollButton(ToolButton):
 
         self.set_size_request(style.GRID_CELL_SIZE, style.GRID_CELL_SIZE)
 
-        self.icon = Icon(icon_name = icon_name,
+        self.icon = Icon(icon_name=icon_name,
                          icon_size=gtk.ICON_SIZE_SMALL_TOOLBAR)
         # The alignment is a hack to work around gtk.ToolButton code
         # that sets the icon_size when the icon_widget is a gtk.Image
diff --git a/src/sugar/util.py b/src/sugar/util.py
index e1bcf88d..9604dbf6 100644
--- a/src/sugar/util.py
+++ b/src/sugar/util.py
@@ -50,7 +50,7 @@ def sha_data(data):
     return sha_hash.digest()
 
 
-def unique_id(data = ''):
+def unique_id(data=''):
     """Generate a likely-unique ID for whatever purpose
 
     data -- suffix appended to working data before hashing