PEP8 white space and long line fixes

src/sugar/datastore/datastore.py

@@ -29,10 +29,10 @@ import gobject
 from sugar.datastore import dbus_helpers
 from sugar import mime
 
+
 class DSMetadata(gobject.GObject):
     __gsignals__ = {
-        'updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-                    ([]))
+        'updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
     }
 
     def __init__(self, props=None):
@@ -80,7 +80,9 @@ class DSMetadata(gobject.GObject):
         else:
             return default
 
+
 class DSObject(object):
+
     def __init__(self, object_id, metadata=None, file_path=None):
         self.object_id = object_id
         self._metadata = metadata
@@ -129,13 +131,14 @@ class DSObject(object):
 
     def __del__(self):
         if not self._destroyed:
-            logging.warning('DSObject was deleted without cleaning up first. ' \
+            logging.warning('DSObject was deleted without cleaning up first. '
                             'Call DSObject.destroy() before disposing it.')
             self.destroy()
 
     def copy(self):
         return DSObject(None, self._metadata.copy(), self._file_path)
 
+
 def get(object_id):
     logging.debug('datastore.get')
     metadata = dbus_helpers.get_properties(object_id)
@@ -144,12 +147,14 @@ def get(object_id):
     # TODO: register the object for updates
     return ds_object
 
+
 def create():
     metadata = DSMetadata()
     metadata['mtime'] = datetime.now().isoformat()
     metadata['timestamp'] = int(time.time())
     return DSObject(object_id=None, metadata=metadata, file_path=None)
 
+
 def write(ds_object, update_mtime=True, transfer_ownership=False,
           reply_handler=None, error_handler=None, timeout=-1):
     logging.debug('datastore.write')
@@ -185,10 +190,12 @@ def write(ds_object, update_mtime=True, transfer_ownership=False,
         # TODO: register the object for updates
     logging.debug('Written object %s to the datastore.', ds_object.object_id)
 
+
 def delete(object_id):
     logging.debug('datastore.delete')
     dbus_helpers.delete(object_id)
 
+
 def find(query, sorting=None, limit=None, offset=None, properties=None,
          reply_handler=None, error_handler=None):
 
@@ -217,6 +224,7 @@ def find(query, sorting=None, limit=None, offset=None, properties=None,
 
     return objects, total_count
 
+
 def copy(jobject, mount_point):
 
     new_jobject = jobject.copy()
@@ -238,17 +246,22 @@ def copy(jobject, mount_point):
 
     write(new_jobject)
 
+
 def mount(uri, options, timeout=-1):
     return dbus_helpers.mount(uri, options, timeout=timeout)
 
+
 def unmount(mount_point_id):
     dbus_helpers.unmount(mount_point_id)
 
+
 def mounts():
     return dbus_helpers.mounts()
 
+
 def complete_indexing():
     return dbus_helpers.complete_indexing()
 
+
 def get_unique_values(key):
     return dbus_helpers.get_unique_values(key)

src/sugar/datastore/dbus_helpers.py

@@ -31,6 +31,7 @@ DS_DBUS_PATH = "/org/laptop/sugar/DataStore"
 
 _data_store = None
 
+
 def _get_data_store():
     global _data_store
 
@@ -41,12 +42,14 @@ def _get_data_store():
                                      DS_DBUS_INTERFACE)
     return _data_store
 
+
 def create(properties, filename, transfer_ownership=False):
     object_id = _get_data_store().create(dbus.Dictionary(properties), filename,
                     transfer_ownership)
     logging.debug('dbus_helpers.create: ' + object_id)
     return object_id
 
+
 def update(uid, properties, filename, transfer_ownership=False,
         reply_handler=None, error_handler=None, timeout=-1):
     debug_props = properties.copy()
@@ -64,19 +67,23 @@ def update(uid, properties, filename, transfer_ownership=False,
         _get_data_store().update(uid, dbus.Dictionary(properties),
                                  filename, transfer_ownership)
 
+
 def delete(uid):
     logging.debug('dbus_helpers.delete: %r', uid)
     _get_data_store().delete(uid)
 
+
 def get_properties(uid):
     logging.debug('dbus_helpers.get_properties: %s', uid)
     return _get_data_store().get_properties(uid, byte_arrays=True)
 
+
 def get_filename(uid):
     filename = _get_data_store().get_filename(uid)
     logging.debug('dbus_helpers.get_filename: %s, %s', uid, filename)
     return filename
 
+
 def find(query, properties, reply_handler, error_handler):
     logging.debug('dbus_helpers.find: %r %r', query, properties)
     if reply_handler and error_handler:
@@ -86,19 +93,23 @@ def find(query, properties, reply_handler, error_handler):
     else:
         return _get_data_store().find(query, properties, byte_arrays=True)
 
+
 def mount(uri, options, timeout=-1):
     return _get_data_store().mount(uri, options, timeout=timeout)
 
+
 def unmount(mount_point_id):
     _get_data_store().unmount(mount_point_id)
 
+
 def mounts():
     return _get_data_store().mounts()
 
+
 def get_unique_values(key):
     return _get_data_store().get_uniquevaluesfor(
                                 key, dbus.Dictionary({}, signature='ss'))
 
+
 def complete_indexing():
     return _get_data_store().complete_indexing()
-