Minor pylint cleanups

3 files changed, 15 insertions, 16 deletions

diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index e73b717..c8e40c1 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -28,7 +28,6 @@ import simplejson
 from sugar.graphics import style
 from sugar.graphics.icon import CanvasIcon
 from sugar.graphics.xocolor import XoColor
-from sugar.graphics.entry import CanvasEntry
 from sugar.graphics.canvastextview import CanvasTextView
 from sugar.util import format_size
 
diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py
index d3b7e24..07f8544 100644
--- a/src/jarabe/journal/listmodel.py
+++ b/src/jarabe/journal/listmodel.py
@@ -103,8 +103,8 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
     def on_get_column_type(self, index):
         return ListModel._COLUMN_TYPES[index]
 
-    def on_iter_n_children(self, iter):
-        if iter == None:
+    def on_iter_n_children(self, iterator):
+        if iterator == None:
             return self._result_set.length
         else:
             return 0
@@ -148,7 +148,7 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
         else:
             buddies = []
 
-        for n in xrange(0, 3):
+        for n_ in xrange(0, 3):
             if buddies:
                 nick, color = buddies.pop(0)
                 self._cached_row.append((nick, XoColor(color)))
@@ -157,32 +157,32 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
 
         return self._cached_row[column]
 
-    def on_iter_nth_child(self, iter, n):
+    def on_iter_nth_child(self, iterator, n):
         return n
 
-    def on_get_path(self, iter):
-        return (iter)
+    def on_get_path(self, iterator):
+        return (iterator)
 
     def on_get_iter(self, path):
         return path[0]
 
-    def on_iter_next(self, iter):
-        if iter != None:
-            if iter >= self._result_set.length - 1:
+    def on_iter_next(self, iterator):
+        if iterator != None:
+            if iterator >= self._result_set.length - 1:
                 return None
-            return iter + 1
+            return iterator + 1
         return None
 
     def on_get_flags(self):
         return gtk.TREE_MODEL_ITERS_PERSIST | gtk.TREE_MODEL_LIST_ONLY
 
-    def on_iter_children(self, iter):
+    def on_iter_children(self, iterator):
         return None
 
-    def on_iter_has_child(self, iter):
+    def on_iter_has_child(self, iterator):
         return False
 
-    def on_iter_parent(self, iter):
+    def on_iter_parent(self, iterator):
         return None
 
     def do_drag_data_get(self, path, selection):
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 01017fc..0e7702d 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -220,8 +220,8 @@ class StartWithMenu(gtk.Menu):
     def __item_activate_cb(self, menu_item, service_name):
         mime_type = self._metadata.get('mime_type', '')
         if mime_type:
-            mime = mimeregistry.get_registry()
-            mime.set_default_activity(mime_type, service_name)
+            mime_registry = mimeregistry.get_registry()
+            mime_registry.set_default_activity(mime_type, service_name)
         misc.resume(self._metadata, service_name)