pylint services

5 files changed, 52 insertions, 54 deletions

diff --git a/service/activityregistryservice.py b/service/activityregistryservice.py
index 9ead767..7746877 100644
--- a/service/activityregistryservice.py
+++ b/service/activityregistryservice.py
@@ -27,7 +27,8 @@ _ACTIVITY_REGISTRY_PATH = '/org/laptop/ActivityRegistry'
 class ActivityRegistry(dbus.service.Object):
     def __init__(self):
         bus = dbus.SessionBus()
-        bus_name = dbus.service.BusName(_ACTIVITY_REGISTRY_SERVICE_NAME, bus=bus)
+        bus_name = dbus.service.BusName(_ACTIVITY_REGISTRY_SERVICE_NAME, 
+                                        bus=bus)
         dbus.service.Object.__init__(self, bus_name, _ACTIVITY_REGISTRY_PATH)
 
         bundle_registry = bundleregistry.get_registry()
diff --git a/service/bundleregistry.py b/service/bundleregistry.py
index 9cf81cc..5b12625 100644
--- a/service/bundleregistry.py
+++ b/service/bundleregistry.py
@@ -23,7 +23,6 @@ import simplejson
 from sugar.bundle.activitybundle import ActivityBundle
 from sugar.bundle.bundle import MalformedBundleException
 from sugar import env
-from sugar import util
 
 import config
 
@@ -73,7 +72,8 @@ class BundleRegistry(gobject.GObject):
                 self._favorite_bundles = simplejson.load(open(path))
                 print 'loaded %r' % self._favorite_bundles 
             except ValueError, e:
-                logging.error('Error while loading favorite_activities: %r.' % e)
+                logging.error('Error while loading favorite_activities: %r.' 
+                              % e)
                 self._favorite_bundles = []
         else:
             self._favorite_bundles = []
@@ -111,13 +111,13 @@ class BundleRegistry(gobject.GObject):
                               'bundle: %s, %s, %s' % (f, e.__class__, e))
 
         bundle_dirs = bundles.keys()
-        bundle_dirs.sort(lambda d1,d2: cmp(bundles[d1], bundles[d2]))
-        for dir in bundle_dirs:
+        bundle_dirs.sort(lambda d1, d2: cmp(bundles[d1], bundles[d2]))
+        for folder in bundle_dirs:
             try:
-                self.add_bundle(dir)
+                self.add_bundle(folder)
             except Exception, e:
                 logging.error('Error while processing installed activity ' \
-                              'bundle: %s, %s, %s' % (dir, e.__class__, e))
+                              'bundle: %s, %s, %s' % (folder, e.__class__, e))
 
     def add_bundle(self, bundle_path):
         try:
@@ -141,7 +141,8 @@ class BundleRegistry(gobject.GObject):
         result = []
         for bundle in self._bundles:
             if bundle.get_mime_types() and mime_type in bundle.get_mime_types():
-                if self.get_default_for_type(mime_type) == bundle.get_bundle_id():
+                if self.get_default_for_type(mime_type) == \
+                        bundle.get_bundle_id():
                     result.insert(0, bundle)
                 else:
                     result.append(bundle)
@@ -184,8 +185,8 @@ def get_registry():
 
 _bundle_registry = BundleRegistry()
 
-for path in _get_data_dirs():
-    bundles_path = os.path.join(path, 'activities')
+for data_dir in _get_data_dirs():
+    bundles_path = os.path.join(data_dir, 'activities')
     _bundle_registry.add_search_path(bundles_path)
 
 _bundle_registry.add_search_path(env.get_user_activities_path())
diff --git a/service/clipboardobject.py b/service/clipboardobject.py
index 70c21a0..06b606c 100644
--- a/service/clipboardobject.py
+++ b/service/clipboardobject.py
@@ -31,7 +31,7 @@ class ClipboardObject:
         self._formats = {}
 
     def destroy(self):
-        for type, format in self._formats.iteritems():
+        for format in self._formats.itervalues():
             format.destroy()
 
     def get_id(self):
@@ -54,8 +54,8 @@ class ClipboardObject:
         return ''
 
     def get_activities(self):
-        mime = self.get_mime_type()
-        if not mime:
+        mime_type = self.get_mime_type()
+        if not mime_type:
             return ''
 
         registry = bundleregistry.get_registry()
@@ -89,17 +89,17 @@ class ClipboardObject:
                 if os.path.exists(uri.path):
                     format = mime.get_for_file(uri.path)
                 else:
-                    format = mime.get_from_file_name(uri.path)                    
+                    format = mime.get_from_file_name(uri.path)
                 logging.debug('Choosed %r!' % format)
 
         return format
 
 class Format:
 
-    def __init__(self, type, data, on_disk):
+    def __init__(self, mime_type, data, on_disk):
         self.owns_disk_data = False
 
-        self._type = type
+        self._type = mime_type
         self._data = data
         self._on_disk = on_disk
 
diff --git a/service/clipboardservice.py b/service/clipboardservice.py
index d69fbaf..4378db0 100644
--- a/service/clipboardservice.py
+++ b/service/clipboardservice.py
@@ -23,8 +23,6 @@ import tempfile
 import dbus
 import dbus.service
 
-from sugar import env
-from sugar import util
 from sugar import mime
 
 from clipboardobject import ClipboardObject, Format
@@ -40,19 +38,20 @@ TYPE_KEY = 'TYPE'
 DATA_KEY = 'DATA'
 ON_DISK_KEY = 'ON_DISK'
 
-class ClipboardService(dbus.service.Object):
+_CLIPBOARD_DBUS_INTERFACE = "org.laptop.Clipboard"
+_CLIPBOARD_OBJECT_PATH = "/org/laptop/Clipboard"
+_CLIPBOARD_OBJECTS_PATH = _CLIPBOARD_OBJECT_PATH + "/Objects/"
 
-    _CLIPBOARD_DBUS_INTERFACE = "org.laptop.Clipboard"
-    _CLIPBOARD_OBJECT_PATH = "/org/laptop/Clipboard"
-    _CLIPBOARD_OBJECTS_PATH = _CLIPBOARD_OBJECT_PATH + "/Objects/"
+class ClipboardService(dbus.service.Object):
 
     def __init__(self):
         self._objects = {}
         self._next_id = 0
 
         bus = dbus.SessionBus()
-        bus_name = dbus.service.BusName(self._CLIPBOARD_DBUS_INTERFACE, bus=bus)
-        dbus.service.Object.__init__(self, bus_name, self._CLIPBOARD_OBJECT_PATH)
+        bus_name = dbus.service.BusName(_CLIPBOARD_DBUS_INTERFACE, bus=bus)
+        dbus.service.Object.__init__(self, bus_name, 
+                                     _CLIPBOARD_OBJECT_PATH)
 
     def _get_next_object_id(self):
         self._next_id += 1
@@ -63,14 +62,15 @@ class ClipboardService(dbus.service.Object):
                          in_signature="s", out_signature="o")
     def add_object(self, name):
         logging.debug('ClipboardService.add_object')
-        op = self._CLIPBOARD_OBJECTS_PATH + "%d" % self._get_next_object_id()
+        op = _CLIPBOARD_OBJECTS_PATH + "%d" % self._get_next_object_id()
         self._objects[op] = ClipboardObject(op, name)
         self.object_added(dbus.ObjectPath(op), name)
         logging.debug('Added object ' + op + ' with name ' + name)
         return dbus.ObjectPath(op)
 
     @dbus.service.method(_CLIPBOARD_DBUS_INTERFACE,
-                         in_signature="ssayb", out_signature="", byte_arrays=True)
+                         in_signature="ssayb", out_signature="", 
+                         byte_arrays=True)
     def add_object_format(self, object_path, format_type, data, on_disk):
         logging.debug('ClipboardService.add_object_format')
         cb_object = self._objects[str(object_path)]
@@ -82,7 +82,8 @@ class ClipboardService(dbus.service.Object):
         elif on_disk and cb_object.get_percent() == 100:
             new_uri = self._copy_file(data)
             cb_object.add_format(Format(format_type, new_uri, on_disk))
-            logging.debug('Added format of type ' + format_type + ' with path at ' + new_uri)
+            logging.debug('Added format of type ' + format_type 
+                          + ' with path at ' + new_uri)
         else:
             cb_object.add_format(Format(format_type, data, on_disk))
             logging.debug('Added in-memory format of type ' + format_type + '.')
@@ -125,15 +126,13 @@ class ClipboardService(dbus.service.Object):
             # Add a text/plain format to objects that are text but lack it
             if 'text/plain' not in formats.keys():
                 if 'UTF8_STRING' in formats.keys():
-                    self.add_object_format(object_path,
-                                           'text/plain',
-                                           data=formats['UTF8_STRING'].get_data(),
-                                           on_disk=False)
+                    self.add_object_format(
+                        object_path, 'text/plain',
+                        data=formats['UTF8_STRING'].get_data(), on_disk=False)
                 elif 'text/unicode' in formats.keys():
-                    self.add_object_format(object_path,
-                                           'text/plain',
-                                           data=formats['UTF8_STRING'].get_data(),
-                                           on_disk=False)
+                    self.add_object_format(
+                        object_path, 'text/plain',
+                        data=formats['UTF8_STRING'].get_data(), on_disk=False)
 
         self.object_state_changed(object_path, {NAME_KEY: cb_object.get_name(),
                                     PERCENT_KEY: percent,
@@ -153,8 +152,8 @@ class ClipboardService(dbus.service.Object):
         formats = cb_object.get_formats()
         format_types = dbus.Array([], signature='s')
         
-        for type, format in formats.iteritems():
-            format_types.append(type)
+        for key in formats.keys():
+            format_types.append(key)
         
         result_dict = {NAME_KEY: cb_object.get_name(),
                 PERCENT_KEY: cb_object.get_percent(),
diff --git a/service/main.py b/service/main.py
index 679cc09..4883f82 100755
--- a/service/main.py
+++ b/service/main.py
@@ -15,32 +15,29 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import sys
-import os
 import logging
 
 import gobject
 import dbus.glib
  
 from sugar import logger
-from sugar import env
 
 import activityregistryservice
 import clipboardservice
 
 def main():
-	logger.start('shellservice')
-	logging.info('Starting shell service.')
-
-	gobject.threads_init()
-	dbus.glib.threads_init()
-
-	clipboard_service = clipboardservice.get_instance()
-	activity_registry = activityregistryservice.get_instance()
-
-	loop = gobject.MainLoop()
-	try:
-	    loop.run()
-	except KeyboardInterrupt:
-	    print 'Ctrl+C pressed, exiting...'
+    logger.start('shellservice')
+    logging.info('Starting shell service.')
+
+    gobject.threads_init()
+    dbus.glib.threads_init()
+    
+    clipboardservice.get_instance()
+    activityregistryservice.get_instance()
+    
+    loop = gobject.MainLoop()
+    try:
+        loop.run()
+    except KeyboardInterrupt:
+        print 'Ctrl+C pressed, exiting...'