PEP8/pylint fixes

1 files changed, 16 insertions, 13 deletions

diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py
index 0a19c28..70d2636 100644
--- a/src/sugar/datastore/datastore.py
+++ b/src/sugar/datastore/datastore.py
@@ -69,7 +69,7 @@ class DSMetadata(gobject.GObject):
     def keys(self):
         return self._props.keys()
 
-    def items(self) :
+    def items(self):
         return self._props.items()
 
     def get_dictionary(self):
@@ -81,9 +81,9 @@ class DSMetadata(gobject.GObject):
     def get(self, key, default=None):
         return self._props.get(key, default)
 
-    def update(self, d) :
-        for (k,v) in d.items() :
-          self[k] = v
+    def update(self, d):
+        for (k, v) in d.items():
+            self[k] = v
 
 
 class DSObject(object):
@@ -96,7 +96,7 @@ class DSObject(object):
 
     def get_metadata(self):
         if self._metadata is None and not self.object_id is None:
-            metadata = DSMetadata(get_properties(self.object_id))
+            metadata = DSMetadata(get_metadata(self.object_id))
             self._metadata = metadata
         return self._metadata
     
@@ -265,21 +265,24 @@ class DatastoreListener(object):
     _sig_names = ['created', 'updated', 'deleted', 'stopped']
 
     def __init__(self):
+        # pylint: disable-msg=W0212
         self._datastore = dbus_helpers._get_data_store()
         self._signal_handlers = [
-            self._datastore.connect_to_signal(sig_name[0].upper()+sig_name[1:],
-                getattr(self, "_datastore_%s_cb" % (sig_name,)))
+            self._datastore.connect_to_signal(
+                sig_name[0].upper() + sig_name[1:],
+                getattr(self, "_datastore_%s_cb" % (sig_name, )))
             for sig_name in self._sig_names]
-        for sig_name in self._sig_names :
+        for sig_name in self._sig_names:
             setattr(self, sig_name, dispatch.Signal())
 
-    def __del__(self) :
+    def __del__(self):
         try :
-            for handler in self._signal_handlers :
+            for handler in self._signal_handlers:
                 handler.remove()
-        except :
-            # ignore errors during garbage collection - the signal handlers might
-            # have already been collected
+        # pylint: disable-msg=W0704
+        except Exception:
+            # Ignore errors during garbage collection - the signal handlers
+            # might have already been collected.
             pass
 
     def _datastore_created_cb(self, object_id):