diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py
index 3f5188e0..2b013665 100644
--- a/src/sugar/datastore/datastore.py
+++ b/src/sugar/datastore/datastore.py
@@ -153,7 +153,7 @@ class DSObject(object):
         return self._object_id
 
     def set_object_id(self, object_id):
-        if self._update_signal_match is not None: 
+        if self._update_signal_match is not None:
             self._update_signal_match.remove()
         if object_id is not None:
             self._update_signal_match = _get_data_store().connect_to_signal(
diff --git a/src/sugar/wm.py b/src/sugar/wm.py
index 418a291a..3bf14214 100644
--- a/src/sugar/wm.py
+++ b/src/sugar/wm.py
@@ -46,7 +46,7 @@ def _property_change_trapped(window, prop, prop_type, format, mode, data):
                       'a property on a window' % error)
         raise RuntimeError('Received X Error (%i) while setting '
                            'a property on a window' % error)
-    
+
 
 def get_activity_id(wnck_window):
     window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
diff --git a/tests/graphics/iconwidget.py b/tests/graphics/iconwidget.py
index cacf5013..625306ed 100644
--- a/tests/graphics/iconwidget.py
+++ b/tests/graphics/iconwidget.py
@@ -45,7 +45,7 @@ def create_icon_widgets(box, sensitive=True):
     icon.set_sensitive(sensitive)
     icon.show()
 
-    icon = Icon(icon_name='computer-xo', 
+    icon = Icon(icon_name='computer-xo',
                 icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR,
                 xo_color=XoColor())
     box.pack_start(icon)
diff --git a/tests/lib/test_mime.py b/tests/lib/test_mime.py
index 3df0ce6b..9a9ad61c 100644
--- a/tests/lib/test_mime.py
+++ b/tests/lib/test_mime.py
@@ -33,7 +33,7 @@ class TestMime(unittest.TestCase):
                 ['text/plain', 'text/_moz_htmlcontext', 'text/unicode',
                  'text/html', 'text/_moz_htmlinfo'])
         self.assertEqual(mime_type, 'text/html')
-        
+
         # Mozilla's text in c&v
         mime_type = mime.choose_most_significant(
                 ['text/_moz_htmlcontext', 'STRING', 'text/html', 'text/_moz_htmlinfo',