Some pylint fixes

3 files changed, 2 insertions, 4 deletions

diff --git a/bin/sugar-session b/bin/sugar-session
index 18bb06c..308fa92 100644
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -24,7 +24,6 @@ if os.environ.get('SUGAR_LOGGER_LEVEL', '') == 'debug':
     print '%r STARTUP: Starting the shell' % time.time()
     sys.stdout.flush()
 
-import shutil
 import gettext
 import logging
 
@@ -171,7 +170,6 @@ def setup_keyboard_cb(gconf_client):
         configrec.activate(engine)
     except:
         logging.exception('Error during keyboard configuration')
-        pass
 
 def main():
     cleanup_logs()
diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py
index 123e336..a5721cd 100644
--- a/extensions/cpsection/keyboard/model.py
+++ b/extensions/cpsection/keyboard/model.py
@@ -17,7 +17,6 @@
 #
 
 import xklavier
-import gobject
 import gconf
 
 
diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
index 65bd49a..a847dca 100644
--- a/extensions/cpsection/keyboard/view.py
+++ b/extensions/cpsection/keyboard/view.py
@@ -116,7 +116,8 @@ class LayoutCombo(gtk.HBox):
     def _set_kvariant_store(self, lang):
         self._kvariant_store = gtk.ListStore(gobject.TYPE_STRING, \
                                                     gobject.TYPE_STRING)
-        for description, name in self._keyboard_manager.get_layouts_for_language(lang):
+        layouts = self._keyboard_manager.get_layouts_for_language(lang)
+        for description, name in layouts:
             self._kvariant_store.append([name, description])
         self._kvariant_combo.set_model(self._kvariant_store)
         self._kvariant_combo.set_active(0)