GNOME.org
 

[kupfer] Remove unused imports and unused variables everywhere

commit 4d7af4b3aee2f8c4fc154019f4c67c87ac05e76b
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Mar 29 16:22:31 2011 +0200

    Remove unused imports and unused variables everywhere
    
    ``pyflakes`` caught all of these in the whole tree. Two actual bugs
    were fixed in the two previous commits, but this commit should have no
    effect at all since all we are removing are redundant variables and
    imports.

 kupfer/core/data.py                |    1 -
 kupfer/core/plugins.py             |    5 ++---
 kupfer/core/qfurl.py               |    2 +-
 kupfer/core/settings.py            |    5 ++---
 kupfer/core/sources.py             |    3 +--
 kupfer/desktop_launch.py           |    2 --
 kupfer/launch.py                   |    9 +++------
 kupfer/main.py                     |    4 ++--
 kupfer/obj/fileactions.py          |    4 +---
 kupfer/obj/helplib.py              |    6 ------
 kupfer/obj/objects.py              |    2 +-
 kupfer/obj/sources.py              |    4 ++--
 kupfer/plugin/abiword.py           |    2 +-
 kupfer/plugin/applications.py      |    2 +-
 kupfer/plugin/archiveinside.py     |    1 -
 kupfer/plugin/archivemanager.py    |    2 --
 kupfer/plugin/audacious.py         |    4 ++--
 kupfer/plugin/calculator.py        |    2 +-
 kupfer/plugin/chromium.py          |    4 +---
 kupfer/plugin/clawsmail.py         |    4 ++--
 kupfer/plugin/commands.py          |    9 ++++-----
 kupfer/plugin/core/__init__.py     |    4 +---
 kupfer/plugin/core/debug.py        |    4 +---
 kupfer/plugin/core/selection.py    |    2 +-
 kupfer/plugin/devhelp.py           |    2 +-
 kupfer/plugin/dictionary.py        |    2 +-
 kupfer/plugin/documents.py         |    8 ++++----
 kupfer/plugin/empathy.py           |    2 --
 kupfer/plugin/epiphany.py          |    2 +-
 kupfer/plugin/favorites.py         |    2 --
 kupfer/plugin/glob.py              |    1 -
 kupfer/plugin/google_search.py     |    2 +-
 kupfer/plugin/google_translate.py  |    6 ------
 kupfer/plugin/image.py             |    4 +---
 kupfer/plugin/kupfer_plugins.py    |    1 -
 kupfer/plugin/locate.py            |    5 ++---
 kupfer/plugin/nautilusselection.py |    4 +---
 kupfer/plugin/opera.py             |    1 -
 kupfer/plugin/operamail.py         |    3 ++-
 kupfer/plugin/pidgin.py            |    4 ++--
 kupfer/plugin/quickview.py         |    1 -
 kupfer/plugin/rhythmbox.py         |    5 ++---
 kupfer/plugin/rst.py               |    4 ++--
 kupfer/plugin/screen.py            |    1 -
 kupfer/plugin/sendkeys.py          |    5 +----
 kupfer/plugin/templates.py         |    2 --
 kupfer/plugin/thunar.py            |    8 +++-----
 kupfer/plugin/thunderbird.py       |    4 ++--
 kupfer/plugin/tracker1.py          |    5 ++---
 kupfer/plugin/triggers.py          |    2 +-
 kupfer/plugin/urlactions.py        |    4 ++--
 kupfer/plugin/vim.py               |    2 +-
 kupfer/plugin/vinagre.py           |    2 +-
 kupfer/plugin/volumes.py           |    3 +--
 kupfer/plugin/websearch.py         |    4 ++--
 kupfer/plugin/windows.py           |    1 -
 kupfer/plugin/zim.py               |    1 -
 kupfer/plugin_support.py           |    4 +---
 kupfer/pretty.py                   |    2 --
 kupfer/ui/browser.py               |    1 -
 kupfer/ui/keybindings.py           |    1 -
 kupfer/ui/preferences.py           |    7 +------
 kupfer/ui/progress_dialog.py       |    2 +-
 kupfer/uiutils.py                  |    1 -
 64 files changed, 69 insertions(+), 139 deletions(-)
---
diff --git a/kupfer/core/data.py b/kupfer/core/data.py
index 2841b7a..9352ef9 100644
--- a/kupfer/core/data.py
+++ b/kupfer/core/data.py
@@ -517,7 +517,6 @@ class DataController (gobject.GObject, pretty.OutputMixin):
 		learn.load()
 
 	def _display(self, sched):
-		sc = GetSourceController()
 		self._reload_source_root()
 		self._save_data_timer.set(DATA_SAVE_INTERVAL_S, self._save_data)
 
diff --git a/kupfer/core/plugins.py b/kupfer/core/plugins.py
index 199201d..93808b0 100644
--- a/kupfer/core/plugins.py
+++ b/kupfer/core/plugins.py
@@ -1,8 +1,7 @@
-import os
 import pkgutil
 import sys
 
-from kupfer import pretty, config
+from kupfer import pretty
 from kupfer.core import settings
 # import kupfer.icons on demand later
 
@@ -238,7 +237,7 @@ def _import_plugin_true(name):
 		raise
 	except NotEnabledError:
 		raise
-	except Exception, e:
+	except Exception:
 		# catch any other error for plugins and write traceback
 		import traceback
 		traceback.print_exc()
diff --git a/kupfer/core/qfurl.py b/kupfer/core/qfurl.py
index f91163d..90bbacc 100644
--- a/kupfer/core/qfurl.py
+++ b/kupfer/core/qfurl.py
@@ -51,7 +51,7 @@ class qfurl (object):
 			typname = "%s.%s" % (type(obj).__module__, type(obj).__name__)
 			try:
 				qfid = obj.qf_id
-			except AttributeError, err:
+			except AttributeError:
 				raise QfurlError("%s has no qfurl" % obj)
 			self.url = _urlunparse((QFURL_SCHEME, "", qfid, "", "", typname))
 		else:
diff --git a/kupfer/core/settings.py b/kupfer/core/settings.py
index a932447..29ffb01 100644
--- a/kupfer/core/settings.py
+++ b/kupfer/core/settings.py
@@ -1,9 +1,8 @@
 from __future__ import with_statement
 
-import ast
-import os, sys
 import ConfigParser
 import copy
+import os
 
 import glib
 import gobject
@@ -80,7 +79,7 @@ class SettingsController (gobject.GObject, pretty.OutputMixin):
 		config_files = []
 		try:
 			defaults_path = config.get_data_file(self.defaults_filename)
-		except config.ResourceLookupError, exc:
+		except config.ResourceLookupError:
 			print "Error: no default config file %s found!" % self.defaults_filename
 		else:
 			self._defaults_path = defaults_path
diff --git a/kupfer/core/sources.py b/kupfer/core/sources.py
index 41d81c6..8a30fba 100644
--- a/kupfer/core/sources.py
+++ b/kupfer/core/sources.py
@@ -1,6 +1,5 @@
 from __future__ import with_statement
 
-import contextlib
 import gzip
 import hashlib
 import itertools
@@ -230,7 +229,7 @@ class SourceDataPickler (pretty.OutputMixin):
 		obj = source.config_save()
 		try:
 			data = pickle.dumps(obj, pickle.HIGHEST_PROTOCOL)
-		except pickle.PickleError, exc:
+		except pickle.PickleError:
 			import traceback
 			self.output_error("Unable to save configuration for", source)
 			self.output_error("Saving configuration raised an exception:")
diff --git a/kupfer/desktop_launch.py b/kupfer/desktop_launch.py
index cd3e69c..3cde126 100644
--- a/kupfer/desktop_launch.py
+++ b/kupfer/desktop_launch.py
@@ -149,7 +149,6 @@ def replace_format_specs(argv, location, desktop_info, gfilelist):
 
 	def replace_single_code(key):
 		"Handle all embedded format codes, including those to be removed"
-		keys = set(["%%", "%f", "%u", "%c", "%k"])
 		deprecated = set(['%d', '%D', '%n', '%N', '%v', '%m'])
 		if key in deprecated:
 			return ""
@@ -233,7 +232,6 @@ def replace_format_specs(argv, location, desktop_info, gfilelist):
 	return supports_single_file, files_added_at_end, new_argv
 
 def _file_for_app_info(app_info):
-	desktop_info = None
 	try:
 		desktop_file = find_desktop_file(app_info.get_id())
 	except ResourceLookupError:
diff --git a/kupfer/launch.py b/kupfer/launch.py
index 5e6b21c..52c22c6 100644
--- a/kupfer/launch.py
+++ b/kupfer/launch.py
@@ -2,7 +2,7 @@ from time import time
 import os
 import cPickle as pickle
 
-import gtk
+import gio
 import gobject
 
 from kupfer import pretty, config
@@ -58,13 +58,10 @@ def launch_application(app_info, files=(), uris=(), paths=(), track=True,
 	"""
 	assert app_info
 
-	from gio import File
-	from glib import GError
-
 	if paths:
-		files = [File(p) for p in paths]
+		files = [gio.File(p) for p in paths]
 	if uris:
-		files = [File(p) for p in uris]
+		files = [gio.File(p) for p in uris]
 
 	svc = GetApplicationsMatcherService()
 	app_id = application_id(app_info, desktop_file)
diff --git a/kupfer/main.py b/kupfer/main.py
index 7bec629..0c44c60 100644
--- a/kupfer/main.py
+++ b/kupfer/main.py
@@ -27,7 +27,7 @@ def setup_locale_and_gettext():
 	# to load in current locale properly for sorting etc
 	try:
 		locale.setlocale(locale.LC_ALL, "")
-	except locale.Error, e:
+	except locale.Error:
 		pass
 
 setup_locale_and_gettext()
@@ -165,7 +165,7 @@ def main():
 		try:
 			import debug
 			debug.install()
-		except ImportError, e:
+		except ImportError:
 			pass
 	sys.excepthook = sys.__excepthook__
 	_set_process_title()
diff --git a/kupfer/obj/fileactions.py b/kupfer/obj/fileactions.py
index ee16a0a..218db76 100644
--- a/kupfer/obj/fileactions.py
+++ b/kupfer/obj/fileactions.py
@@ -1,12 +1,10 @@
 import os
 import gio
 
-from kupfer import icons
-from kupfer import pretty
 from kupfer import utils
 from kupfer import launch
 
-from kupfer.obj.base import Action, InvalidDataError, OperationError
+from kupfer.obj.base import Action, OperationError
 
 class NoDefaultApplicationError (OperationError):
 	pass
diff --git a/kupfer/obj/helplib.py b/kupfer/obj/helplib.py
index 001511c..2f15598 100644
--- a/kupfer/obj/helplib.py
+++ b/kupfer/obj/helplib.py
@@ -5,14 +5,8 @@ This module is a part of the program Kupfer, see the main program file for
 more information.
 """
 
-import functools
-import traceback
-
 import gio
 
-from kupfer import task
-from kupfer import pretty
-
 class PicklingHelperMixin (object):
 	""" This pickling helper will define __getstate__/__setstate__
 	acting simply on the class dictionary; it is up to the inheriting
diff --git a/kupfer/obj/objects.py b/kupfer/obj/objects.py
index bae25a0..d6d1659 100644
--- a/kupfer/obj/objects.py
+++ b/kupfer/obj/objects.py
@@ -15,7 +15,7 @@ import gobject
 
 from kupfer import icons, launch, utils
 from kupfer import pretty
-from kupfer.obj.base import Leaf, Action, Source
+from kupfer.obj.base import Leaf, Action
 from kupfer.obj.base import InvalidDataError, OperationError
 from kupfer.obj import fileactions
 from kupfer.interface import TextRepresentation
diff --git a/kupfer/obj/sources.py b/kupfer/obj/sources.py
index 4f5dd1e..d00f24f 100644
--- a/kupfer/obj/sources.py
+++ b/kupfer/obj/sources.py
@@ -8,9 +8,9 @@ from kupfer import datatools
 from kupfer import icons
 from kupfer import utils
 
-from kupfer.obj.base import Leaf, Action, Source
+from kupfer.obj.base import Source
 from kupfer.obj.helplib import PicklingHelperMixin, FilesystemWatchMixin
-from kupfer.obj.objects import FileLeaf, AppLeaf, SourceLeaf
+from kupfer.obj.objects import FileLeaf, SourceLeaf
 from kupfer.obj.objects import ConstructFileLeaf, ConstructFileLeafTypes
 
 
diff --git a/kupfer/plugin/abiword.py b/kupfer/plugin/abiword.py
index 8214036..57e1f83 100644
--- a/kupfer/plugin/abiword.py
+++ b/kupfer/plugin/abiword.py
@@ -9,7 +9,7 @@ import xml.etree.cElementTree as ElementTree
 
 import gio
 
-from kupfer.objects import Leaf, Action, Source, AppLeaf, FileLeaf, UrlLeaf
+from kupfer.objects import Source, FileLeaf, UrlLeaf
 from kupfer.obj.helplib import PicklingHelperMixin
 from kupfer.obj.apps import AppLeafContentMixin
 
diff --git a/kupfer/plugin/applications.py b/kupfer/plugin/applications.py
index 0543211..c3af39d 100644
--- a/kupfer/plugin/applications.py
+++ b/kupfer/plugin/applications.py
@@ -15,7 +15,7 @@ from gio.unix import desktop_app_info_set_desktop_env
 
 from kupfer.objects import Action, Source, AppLeaf, FileLeaf
 from kupfer.obj.helplib import FilesystemWatchMixin
-from kupfer import config, utils, plugin_support
+from kupfer import config, plugin_support
 
 __kupfer_settings__ = plugin_support.PluginSettings(
 	{
diff --git a/kupfer/plugin/archiveinside.py b/kupfer/plugin/archiveinside.py
index 818d38f..4138488 100644
--- a/kupfer/plugin/archiveinside.py
+++ b/kupfer/plugin/archiveinside.py
@@ -21,7 +21,6 @@ from kupfer.objects import Source, FileLeaf
 from kupfer.obj.sources import DirectorySource
 from kupfer import pretty
 from kupfer import scheduler
-from kupfer import utils
 
 # Limit this to archives of a couple of megabytes
 MAX_ARCHIVE_BYTE_SIZE = 15 * 1024**2
diff --git a/kupfer/plugin/archivemanager.py b/kupfer/plugin/archivemanager.py
index b81e962..af3f7ef 100644
--- a/kupfer/plugin/archivemanager.py
+++ b/kupfer/plugin/archivemanager.py
@@ -106,13 +106,11 @@ class CreateArchiveIn (Action):
 		return True
 
 	def activate(self, leaf, iobj, ctx):
-		archive_type = __kupfer_settings__["archive_type"]
 		dirpath = iobj.object
 		basename = os_path.basename(leaf.object)
 		self._make_archive(ctx, basename, dirpath, (leaf.object, ))
 
 	def activate_multiple(self, objs, iobjs, ctx):
-		archive_type = __kupfer_settings__["archive_type"]
 		# TRANS: Default filename (no extension) for 'Create Archive In...'
 		basename = _("Archive")
 		for iobj in iobjs:
diff --git a/kupfer/plugin/audacious.py b/kupfer/plugin/audacious.py
index c8f8542..b62840d 100644
--- a/kupfer/plugin/audacious.py
+++ b/kupfer/plugin/audacious.py
@@ -7,9 +7,9 @@ __author__ = "Horia V. Corcalciuc <h v corcalciuc gmail com>"
 import subprocess
 
 from kupfer.objects import Leaf, Source, Action
-from kupfer.objects import AppLeaf, RunnableLeaf, SourceLeaf
+from kupfer.objects import RunnableLeaf, SourceLeaf
 from kupfer.obj.apps import AppLeafContentMixin
-from kupfer import objects, icons, utils
+from kupfer import icons, utils
 from kupfer import plugin_support
 from kupfer import kupferstring
 
diff --git a/kupfer/plugin/calculator.py b/kupfer/plugin/calculator.py
index eac506a..4597c01 100644
--- a/kupfer/plugin/calculator.py
+++ b/kupfer/plugin/calculator.py
@@ -9,7 +9,7 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 import cmath
 import math
 
-from kupfer.objects import Source, Action, TextLeaf
+from kupfer.objects import Action, TextLeaf
 from kupfer import pretty
 
 
diff --git a/kupfer/plugin/chromium.py b/kupfer/plugin/chromium.py
index 2e11209..f27a9c1 100644
--- a/kupfer/plugin/chromium.py
+++ b/kupfer/plugin/chromium.py
@@ -4,9 +4,7 @@ __description__ = _("Index of Chromium bookmarks")
 __version__ = ""
 __author__ = "Francesco Marella <francesco marella gmail com>"
 
-import os
-
-from kupfer.objects import Leaf, Action, Source
+from kupfer.objects import Source
 from kupfer.objects import UrlLeaf
 from kupfer import config
 from kupfer.obj.apps import AppLeafContentMixin
diff --git a/kupfer/plugin/clawsmail.py b/kupfer/plugin/clawsmail.py
index 57c2fa1..0aa4ab3 100644
--- a/kupfer/plugin/clawsmail.py
+++ b/kupfer/plugin/clawsmail.py
@@ -10,13 +10,13 @@ import os
 from xml.dom import minidom
 import xml
 
-from kupfer.objects import Leaf, Action, Source
+from kupfer.objects import Action
 from kupfer.objects import TextLeaf, UrlLeaf, RunnableLeaf, FileLeaf
 from kupfer import utils
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer.obj.helplib import FilesystemWatchMixin
 from kupfer.obj.grouping import ToplevelGroupingSource
-from kupfer.obj.contacts import EMAIL_KEY, ContactLeaf, EmailContact, email_from_leaf
+from kupfer.obj.contacts import ContactLeaf, EmailContact, email_from_leaf
 
 
 
diff --git a/kupfer/plugin/commands.py b/kupfer/plugin/commands.py
index f26dad3..de0df77 100644
--- a/kupfer/plugin/commands.py
+++ b/kupfer/plugin/commands.py
@@ -15,7 +15,7 @@ import os
 
 import gobject
 
-from kupfer.objects import TextSource, Leaf, TextLeaf, Action, FileLeaf
+from kupfer.objects import TextSource, TextLeaf, Action, FileLeaf
 from kupfer.objects import OperationError
 from kupfer.obj.fileactions import Execute
 from kupfer import utils, icons
@@ -53,7 +53,7 @@ class GetOutput (Action):
 			finish_command(ctx, acommand, stdout, stderr)
 
 		pretty.print_debug(__name__, "Spawning with timeout 15 seconds")
-		acom = utils.AsyncCommand(argv, finish_callback, 15)
+		utils.AsyncCommand(argv, finish_callback, 15)
 
 	def get_description(self):
 		return _("Run program and return its output") + u" \N{GEAR}"
@@ -81,7 +81,7 @@ class PassToCommand (Action):
 
 		argv.extend([o.object for o in objs])
 		pretty.print_debug(__name__, "Spawning without timeout")
-		acom = utils.AsyncCommand(argv, finish_callback, None)
+		utils.AsyncCommand(argv, finish_callback, None)
 
 	def activate_multiple(self, objs, iobjs, ctx):
 		for iobj in iobjs:
@@ -128,8 +128,7 @@ class WriteToCommand (Action):
 			finish_command(ctx, acommand, stdout, stderr, self.post_result)
 
 		pretty.print_debug(__name__, "Spawning without timeout")
-		acom = utils.AsyncCommand(argv, finish_callback, None,
-		                          stdin=leaf.object)
+		utils.AsyncCommand(argv, finish_callback, None, stdin=leaf.object)
 
 	def item_types(self):
 		yield TextLeaf
diff --git a/kupfer/plugin/core/__init__.py b/kupfer/plugin/core/__init__.py
index 39f3514..d6895df 100644
--- a/kupfer/plugin/core/__init__.py
+++ b/kupfer/plugin/core/__init__.py
@@ -14,15 +14,13 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
 import gtk
 
-from kupfer.objects import Leaf, Action, Source
+from kupfer.objects import Leaf, Action
 from kupfer.obj.sources import MultiSource
 from kupfer import objects
 from kupfer.obj.base import InvalidLeafError
 from kupfer import interface
 from kupfer import pretty
 from kupfer import task
-from kupfer import plugin_support
-
 
 def _is_debug():
 	# Return True if Kupfer is in debug mode
diff --git a/kupfer/plugin/core/debug.py b/kupfer/plugin/core/debug.py
index 0f73ad2..15b378b 100644
--- a/kupfer/plugin/core/debug.py
+++ b/kupfer/plugin/core/debug.py
@@ -5,9 +5,8 @@ These are not meant to be useful to "normal" users of Kupfer -- if they are,
 they can be tested here before they migrate to a fitting plugin.
 """
 
-from kupfer.obj.base import Action, Leaf, Source, InvalidLeafError
+from kupfer.obj.base import Action, Leaf, Source
 from kupfer.obj.compose import ComposedLeaf
-from kupfer.obj import objects
 from kupfer import pretty
 
 __kupfer_sources__ = ()
@@ -29,7 +28,6 @@ class DebugInfo (Action):
 		Action.__init__(self, u"Debug Info")
 
 	def activate(self, leaf):
-		import itertools
 		import StringIO
 		# NOTE: Core imports
 		from kupfer.core import qfurl
diff --git a/kupfer/plugin/core/selection.py b/kupfer/plugin/core/selection.py
index f0e2366..a45c791 100644
--- a/kupfer/plugin/core/selection.py
+++ b/kupfer/plugin/core/selection.py
@@ -1,6 +1,6 @@
 import gtk
 
-from kupfer.objects import Source, Leaf
+from kupfer.objects import Source
 from kupfer.objects import TextLeaf, SourceLeaf
 from kupfer.weaklib import gobject_connect_weakly
 from kupfer import kupferstring
diff --git a/kupfer/plugin/devhelp.py b/kupfer/plugin/devhelp.py
index bbfa066..338c3ac 100644
--- a/kupfer/plugin/devhelp.py
+++ b/kupfer/plugin/devhelp.py
@@ -4,7 +4,7 @@ __description__ = _("Search in Devhelp")
 __version__ = ""
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-from kupfer.objects import Source, Action, TextLeaf
+from kupfer.objects import Action, TextLeaf
 from kupfer import utils
 
 
diff --git a/kupfer/plugin/dictionary.py b/kupfer/plugin/dictionary.py
index 23b5d57..27a6696 100644
--- a/kupfer/plugin/dictionary.py
+++ b/kupfer/plugin/dictionary.py
@@ -4,7 +4,7 @@ __description__ = _("Look up word in dictionary")
 __version__ = ""
 __author__ = "Ulrik"
 
-from kupfer.objects import Source, Action, TextLeaf, OperationError
+from kupfer.objects import Action, TextLeaf, OperationError
 from kupfer import utils
 from kupfer import plugin_support
 from kupfer import kupferstring
diff --git a/kupfer/plugin/documents.py b/kupfer/plugin/documents.py
index 3af27e7..b691f4c 100644
--- a/kupfer/plugin/documents.py
+++ b/kupfer/plugin/documents.py
@@ -10,10 +10,10 @@ from os import path
 import gio
 from gtk import recent_manager_get_default
 
-from kupfer.objects import (Leaf, Action, Source,
-		AppLeaf, FileLeaf, UrlLeaf, )
-from kupfer import objects, plugin_support
-from kupfer import launch, icons
+from kupfer.objects import Source, AppLeaf, FileLeaf, UrlLeaf
+from kupfer import icons
+from kupfer import launch
+from kupfer import plugin_support
 from kupfer.weaklib import gobject_connect_weakly
 
 __kupfer_settings__ = plugin_support.PluginSettings(
diff --git a/kupfer/plugin/empathy.py b/kupfer/plugin/empathy.py
index b26d78b..8af3bc0 100644
--- a/kupfer/plugin/empathy.py
+++ b/kupfer/plugin/empathy.py
@@ -12,7 +12,6 @@ import time
 
 from kupfer import icons
 from kupfer import plugin_support
-from kupfer import pretty
 from kupfer.objects import Leaf, Action, Source, AppLeaf
 from kupfer.weaklib import dbus_signal_connect_weakly
 from kupfer.obj.helplib import PicklingHelperMixin
@@ -68,7 +67,6 @@ EMPATHY_ACCOUNT_KEY = "EMPATHY_ACCOUNT"
 EMPATHY_CONTACT_ID = "EMPATHY_CONTACT_ID"
 
 def _create_dbus_connection():
-	interface = None
 	sbus = dbus.SessionBus()
 	proxy_obj = sbus.get_object(ACCOUNTMANAGER_IFACE, ACCOUNTMANAGER_PATH)
 	dbus_iface = dbus.Interface(proxy_obj, DBUS_PROPS_IFACE)
diff --git a/kupfer/plugin/epiphany.py b/kupfer/plugin/epiphany.py
index 5cb97d5..6d50f6f 100644
--- a/kupfer/plugin/epiphany.py
+++ b/kupfer/plugin/epiphany.py
@@ -6,7 +6,7 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
 import os
 
-from kupfer.objects import Leaf, Action, Source
+from kupfer.objects import Source
 from kupfer.objects import UrlLeaf
 from kupfer.obj.apps import AppLeafContentMixin
 
diff --git a/kupfer/plugin/favorites.py b/kupfer/plugin/favorites.py
index 439c761..8e96326 100644
--- a/kupfer/plugin/favorites.py
+++ b/kupfer/plugin/favorites.py
@@ -5,11 +5,9 @@ __description__ = _("Mark commonly used items and store objects for later use")
 __version__ = "2009-12-30"
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-import collections
 import weakref
 
 from kupfer.objects import Leaf, Source, Action
-from kupfer import utils, objects, pretty
 from kupfer import puid
 
 # NOTE: core import
diff --git a/kupfer/plugin/glob.py b/kupfer/plugin/glob.py
index c89df39..58a79cd 100644
--- a/kupfer/plugin/glob.py
+++ b/kupfer/plugin/glob.py
@@ -11,7 +11,6 @@ import re
 
 from kupfer.objects import Action, TextLeaf, TextSource, Leaf, OperationError
 from kupfer.obj.compose import MultipleLeaf
-from kupfer import utils, pretty
 
 class Glob (Action):
 	def __init__(self):
diff --git a/kupfer/plugin/google_search.py b/kupfer/plugin/google_search.py
index 716de51..59cf8d8 100644
--- a/kupfer/plugin/google_search.py
+++ b/kupfer/plugin/google_search.py
@@ -7,7 +7,7 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 import httplib
 import urllib
 
-from kupfer.objects import Action, Source, Leaf, OperationError
+from kupfer.objects import Action, Source, OperationError
 from kupfer.objects import TextLeaf, UrlLeaf
 from kupfer.plugin import ssl_support
 
diff --git a/kupfer/plugin/google_translate.py b/kupfer/plugin/google_translate.py
index 81f141a..8cfdc8f 100644
--- a/kupfer/plugin/google_translate.py
+++ b/kupfer/plugin/google_translate.py
@@ -54,12 +54,6 @@ def _translate(text, lang):
 	''' Translate @text to @lang. '''
 	query_param = urllib.urlencode(dict(v="1.0",langpair="|"+lang,
 		                                q=text.encode('utf-8')))
-	word_classes = {
-		# TRANS: Dictionary lookup word classes
-		"noun": _("noun"),
-		"verb": _("verb"),
-		"adjective": _("adjective"),
-	}
 	try:
 		if ssl_support.is_supported():
 			conn = ssl_support.VerifiedHTTPSConnection(_GOOGLE_TRANSLATE_HOST,
diff --git a/kupfer/plugin/image.py b/kupfer/plugin/image.py
index a9c5650..fccea3e 100644
--- a/kupfer/plugin/image.py
+++ b/kupfer/plugin/image.py
@@ -11,12 +11,11 @@ __description__ = _("Image transformation tools")
 __version__ = ""
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-import os
 # since "path" is a very generic name, you often forget..
 from os import path as os_path
 import subprocess
 
-from kupfer.objects import Leaf, Action, FileLeaf, TextLeaf
+from kupfer.objects import Action, FileLeaf, TextLeaf
 from kupfer import utils, pretty
 from kupfer import runtimehelper
 
@@ -131,7 +130,6 @@ class Autorotate (Action):
 
 	def activate(self, leaf, obj=None):
 		fpath = leaf.object
-		dirname = os_path.dirname(fpath)
 		argv = ['jhead', '-autorot', fpath]
 		utils.spawn_async(argv)
 
diff --git a/kupfer/plugin/kupfer_plugins.py b/kupfer/plugin/kupfer_plugins.py
index fa972b0..412b619 100644
--- a/kupfer/plugin/kupfer_plugins.py
+++ b/kupfer/plugin/kupfer_plugins.py
@@ -7,7 +7,6 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 import os
 
 from kupfer.objects import Action, Source, Leaf, FileLeaf, TextLeaf
-from kupfer import icons
 from kupfer import kupferui
 
 # Since this is a core plugin we break some rules
diff --git a/kupfer/plugin/locate.py b/kupfer/plugin/locate.py
index 6ac2369..40f447a 100644
--- a/kupfer/plugin/locate.py
+++ b/kupfer/plugin/locate.py
@@ -6,11 +6,10 @@ __description__ = _("Search filesystem using locate")
 __version__ = ""
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-import os
 import subprocess
 
-from kupfer.objects import Action, Source, Leaf
-from kupfer.objects import TextLeaf, FileLeaf
+from kupfer.objects import Action, Source
+from kupfer.objects import TextLeaf
 from kupfer import icons, plugin_support
 from kupfer.obj.objects import ConstructFileLeaf
 
diff --git a/kupfer/plugin/nautilusselection.py b/kupfer/plugin/nautilusselection.py
index 5adcaef..692f4c5 100644
--- a/kupfer/plugin/nautilusselection.py
+++ b/kupfer/plugin/nautilusselection.py
@@ -4,13 +4,11 @@ __description__ = _("Provides current nautilus selection, using Kupfer's Nautilu
 __version__ = ""
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-import os
-
 import dbus
 import gobject
 import gio
 
-from kupfer.objects import Source, Leaf
+from kupfer.objects import Source
 from kupfer.objects import FileLeaf, SourceLeaf
 from kupfer.obj.compose import MultipleLeaf
 from kupfer.obj.helplib import PicklingHelperMixin
diff --git a/kupfer/plugin/opera.py b/kupfer/plugin/opera.py
index 116822f..2d6324d 100644
--- a/kupfer/plugin/opera.py
+++ b/kupfer/plugin/opera.py
@@ -11,7 +11,6 @@ import codecs
 import os
 
 from kupfer.objects import Source, UrlLeaf
-from kupfer import plugin_support
 from kupfer.obj.apps import ApplicationSource
 
 
diff --git a/kupfer/plugin/operamail.py b/kupfer/plugin/operamail.py
index 24741a0..8c2d183 100644
--- a/kupfer/plugin/operamail.py
+++ b/kupfer/plugin/operamail.py
@@ -8,7 +8,8 @@ __author__ = "Chris Parsons <cjparsons1 yahoo co uk>"
 
 import codecs
 import os
-from kupfer.objects import Leaf, Action, Source
+
+from kupfer.objects import Action
 from kupfer.objects import TextLeaf, UrlLeaf, RunnableLeaf
 from kupfer import utils
 from kupfer.obj.helplib import FilesystemWatchMixin
diff --git a/kupfer/plugin/pidgin.py b/kupfer/plugin/pidgin.py
index 4e494dd..66144aa 100644
--- a/kupfer/plugin/pidgin.py
+++ b/kupfer/plugin/pidgin.py
@@ -13,12 +13,12 @@ __author__ = ("Chmouel Boudjnah <chmouel chmouel com>, "
 
 import dbus
 
-from kupfer.objects import Leaf, Action, Source, TextLeaf, TextSource
+from kupfer.objects import Action, TextLeaf, TextSource
 from kupfer import pretty, scheduler
 from kupfer import icons
 from kupfer import plugin_support
 from kupfer.obj.apps import AppLeafContentMixin
-from kupfer.obj.helplib import PicklingHelperMixin, FilesystemWatchMixin
+from kupfer.obj.helplib import PicklingHelperMixin
 from kupfer.obj.grouping import ToplevelGroupingSource
 from kupfer.weaklib import dbus_signal_connect_weakly
 from kupfer.obj.contacts import NAME_KEY, EMAIL_KEY, ContactLeaf, is_valid_email
diff --git a/kupfer/plugin/quickview.py b/kupfer/plugin/quickview.py
index 877288f..dfa62a7 100644
--- a/kupfer/plugin/quickview.py
+++ b/kupfer/plugin/quickview.py
@@ -13,7 +13,6 @@ import gtk
 from kupfer.objects import Action, FileLeaf
 from kupfer.objects import OperationError
 from kupfer import utils
-from kupfer.ui import uievents
 
 
 def is_content_type(fileleaf, ctype):
diff --git a/kupfer/plugin/rhythmbox.py b/kupfer/plugin/rhythmbox.py
index 5625bd9..328c9e3 100644
--- a/kupfer/plugin/rhythmbox.py
+++ b/kupfer/plugin/rhythmbox.py
@@ -10,9 +10,8 @@ from hashlib import md5
 import gio
 import os
 
-from kupfer.objects import (Leaf, Source, AppLeaf, Action, RunnableLeaf,
-		SourceLeaf )
-from kupfer import objects, icons, utils, config
+from kupfer.objects import Leaf, Source, Action, RunnableLeaf, SourceLeaf
+from kupfer import icons, utils, config
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import plugin_support
 from kupfer.plugin import rhythmbox_support
diff --git a/kupfer/plugin/rst.py b/kupfer/plugin/rst.py
index e240c03..9da75d1 100644
--- a/kupfer/plugin/rst.py
+++ b/kupfer/plugin/rst.py
@@ -6,7 +6,7 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
 import os
 
-from kupfer.objects import Source, Action, TextLeaf, FileLeaf
+from kupfer.objects import Action, FileLeaf
 from kupfer import utils, icons
 
 
@@ -21,7 +21,7 @@ class RenderView (Action):
 		finput = open(leaf.object, "rb")
 		(foutput, fpath) = utils.get_safe_tempfile()
 		try:
-			parsed_content = docutils.core.publish_file(finput,
+			docutils.core.publish_file(finput,
 					destination=foutput,
 					writer_name="html")
 		finally:
diff --git a/kupfer/plugin/screen.py b/kupfer/plugin/screen.py
index 2d29934..2f3502f 100644
--- a/kupfer/plugin/screen.py
+++ b/kupfer/plugin/screen.py
@@ -92,7 +92,6 @@ class AttachScreen (Action):
 		super(AttachScreen, self).__init__(name)
 	def activate(self, leaf):
 		pid = leaf.object
-		action = "screen -x -R %s" % pid
 		action_argv = ['screen', '-x', '-R', ('%s' % pid)]
 		utils.spawn_in_terminal(action_argv)
 
diff --git a/kupfer/plugin/sendkeys.py b/kupfer/plugin/sendkeys.py
index 80f4ab5..d44e8ab 100644
--- a/kupfer/plugin/sendkeys.py
+++ b/kupfer/plugin/sendkeys.py
@@ -10,13 +10,10 @@ __description__ = _("Send synthetic keyboard events using "
 __version__ = ""
 __author__ = ""
 
-import string
-
 import gtk
 
-from kupfer.objects import Leaf, Action, Source, TextLeaf
+from kupfer.objects import Leaf, Action, TextLeaf
 from kupfer.objects import OperationError
-from kupfer import pretty
 from kupfer import utils
 from kupfer import interface
 
diff --git a/kupfer/plugin/templates.py b/kupfer/plugin/templates.py
index 79962a7..910311e 100644
--- a/kupfer/plugin/templates.py
+++ b/kupfer/plugin/templates.py
@@ -14,8 +14,6 @@ from kupfer.objects import Leaf, Action, Source, FileLeaf
 from kupfer import icons, utils
 from kupfer.obj import helplib
 from kupfer.obj.helplib import FilesystemWatchMixin
-from kupfer import plugin_support
-
 
 DEFAULT_TMPL_DIR = "~/Templates"
 
diff --git a/kupfer/plugin/thunar.py b/kupfer/plugin/thunar.py
index 17df255..3d3b2ef 100644
--- a/kupfer/plugin/thunar.py
+++ b/kupfer/plugin/thunar.py
@@ -16,15 +16,13 @@ import os
 import dbus
 import gio
 
-from kupfer.objects import Leaf, Action, Source
-from kupfer.objects import (InvalidDataError, OperationError, NotAvailableError,
-                            NoMultiError)
-from kupfer.objects import FileLeaf, RunnableLeaf, SourceLeaf, AppLeaf
+from kupfer.objects import Action, Source
+from kupfer.objects import InvalidDataError, NotAvailableError, NoMultiError
+from kupfer.objects import FileLeaf, RunnableLeaf, AppLeaf
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import config
 from kupfer import plugin_support
 from kupfer import pretty
-from kupfer import utils
 
 plugin_support.check_dbus_connection()
 
diff --git a/kupfer/plugin/thunderbird.py b/kupfer/plugin/thunderbird.py
index 188b26d..d35e9b2 100644
--- a/kupfer/plugin/thunderbird.py
+++ b/kupfer/plugin/thunderbird.py
@@ -10,13 +10,13 @@ __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 
 import os
 
-from kupfer.objects import Leaf, Action, Source
+from kupfer.objects import Action
 from kupfer.objects import TextLeaf, UrlLeaf, RunnableLeaf
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer.obj.helplib import FilesystemWatchMixin
 from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource
-from kupfer.obj.contacts import EMAIL_KEY, ContactLeaf, EmailContact, email_from_leaf
+from kupfer.obj.contacts import ContactLeaf, EmailContact, email_from_leaf
 
 from kupfer.plugin import thunderbird_support as support
 
diff --git a/kupfer/plugin/tracker1.py b/kupfer/plugin/tracker1.py
index 136e09d..0c9eb51 100644
--- a/kupfer/plugin/tracker1.py
+++ b/kupfer/plugin/tracker1.py
@@ -19,15 +19,14 @@ __description__ = _("Tracker desktop search integration")
 __version__ = "2010-04-01"
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-import os
 from xml.etree.cElementTree import ElementTree
 
 import dbus
 import gio
 import gobject
 
-from kupfer.objects import Action, Source, Leaf
-from kupfer.objects import TextLeaf, SourceLeaf, TextSource, FileLeaf
+from kupfer.objects import Action, Source
+from kupfer.objects import TextLeaf, FileLeaf
 from kupfer.obj.objects import ConstructFileLeaf
 from kupfer import utils, pretty
 from kupfer import kupferstring
diff --git a/kupfer/plugin/triggers.py b/kupfer/plugin/triggers.py
index 54e1135..24fbd63 100644
--- a/kupfer/plugin/triggers.py
+++ b/kupfer/plugin/triggers.py
@@ -11,7 +11,7 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 import gtk
 import glib
 
-from kupfer.objects import Action, Source, TextSource
+from kupfer.objects import Action, Source
 from kupfer.objects import TextLeaf, RunnableLeaf
 from kupfer.objects import OperationError
 from kupfer.obj.compose import ComposedLeaf
diff --git a/kupfer/plugin/urlactions.py b/kupfer/plugin/urlactions.py
index 6a44904..962264f 100644
--- a/kupfer/plugin/urlactions.py
+++ b/kupfer/plugin/urlactions.py
@@ -13,8 +13,8 @@ import os
 import shutil
 import urllib
 
-from kupfer.objects import Action, Source, UrlLeaf, FileLeaf, OperationError
-from kupfer import utils, pretty, task
+from kupfer.objects import Action, UrlLeaf, FileLeaf
+from kupfer import utils, task
 
 class DownloadTask (task.ThreadTask):
 	def __init__(self, uri, destdir=None, tempfile=False, finish_callback=None):
diff --git a/kupfer/plugin/vim.py b/kupfer/plugin/vim.py
index 3dfb933..0ff5368 100644
--- a/kupfer/plugin/vim.py
+++ b/kupfer/plugin/vim.py
@@ -9,7 +9,7 @@ import os
 import gio
 import glib
 
-from kupfer.objects import Leaf, Action, Source, AppLeaf, FileLeaf, UrlLeaf
+from kupfer.objects import Source, FileLeaf
 from kupfer.obj.helplib import PicklingHelperMixin
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import datatools
diff --git a/kupfer/plugin/vinagre.py b/kupfer/plugin/vinagre.py
index 142dc1b..760e4bd 100644
--- a/kupfer/plugin/vinagre.py
+++ b/kupfer/plugin/vinagre.py
@@ -14,7 +14,7 @@ import gio
 from xml.etree import cElementTree as ElementTree
 
 from kupfer.objects import Action, UrlLeaf
-from kupfer.obj.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.obj.helplib import PicklingHelperMixin
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource 
diff --git a/kupfer/plugin/volumes.py b/kupfer/plugin/volumes.py
index 5fc8ba0..8a85461 100644
--- a/kupfer/plugin/volumes.py
+++ b/kupfer/plugin/volumes.py
@@ -6,9 +6,8 @@ __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
 import gio
 
-from kupfer.objects import Leaf, Action, Source, FileLeaf
+from kupfer.objects import Action, Source, FileLeaf
 from kupfer.obj.fileactions import Open, OpenTerminal
-from kupfer.objects import OperationError
 from kupfer import utils
 
 
diff --git a/kupfer/plugin/websearch.py b/kupfer/plugin/websearch.py
index 2cb0658..84f492e 100644
--- a/kupfer/plugin/websearch.py
+++ b/kupfer/plugin/websearch.py
@@ -118,8 +118,8 @@ class OpenSearchSource (Source):
 		"""This is a coroutine to parse OpenSearch files"""
 		vital_keys = set(["Url", "ShortName"])
 		keys =  set(["Description", "Url", "ShortName", "InputEncoding"])
-		mozns = '{http://www.mozilla.org/2006/browser/search/}'
-		osns = '{http://a9.com/-/spec/opensearch/1.1/}'
+		#mozns = '{http://www.mozilla.org/2006/browser/search/}'
+		#osns = '{http://a9.com/-/spec/opensearch/1.1/}'
 		roots = ('OpenSearchDescription', 'SearchPlugin')
 		gettagname = lambda tag: tag.rsplit("}", 1)[-1]
 
diff --git a/kupfer/plugin/windows.py b/kupfer/plugin/windows.py
index 090d383..4a5e911 100644
--- a/kupfer/plugin/windows.py
+++ b/kupfer/plugin/windows.py
@@ -4,7 +4,6 @@ __description__ = _("All windows on all workspaces")
 __version__ = "2010-01-08"
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
-import gtk
 import wnck
 
 from kupfer.objects import Leaf, Action, Source
diff --git a/kupfer/plugin/zim.py b/kupfer/plugin/zim.py
index 1c6e189..2b73bb1 100644
--- a/kupfer/plugin/zim.py
+++ b/kupfer/plugin/zim.py
@@ -225,7 +225,6 @@ def _get_zim_notebooks():
 		pretty.print_error(__name__, "Zim notebooks.list not found")
 		return []
 	try:
-		default_url = None
 		with open(zim_notebooks_file, 'r') as notebooks_file:
 			for line in notebooks_file.readlines():
 				if line.strip() == "[NotebookList]":
diff --git a/kupfer/plugin_support.py b/kupfer/plugin_support.py
index 7d850e9..1b4d3d8 100644
--- a/kupfer/plugin_support.py
+++ b/kupfer/plugin_support.py
@@ -1,5 +1,3 @@
-import os
-
 import gobject
 
 try:
@@ -142,7 +140,7 @@ def check_dbus_connection():
 		try:
 			dbus.Bus()
 			_has_dbus_connection = True
-		except dbus.DBusException, err:
+		except dbus.DBusException:
 			_has_dbus_connection = False
 	if not _has_dbus_connection:
 		raise ImportError(_("No D-Bus connection to desktop session"))
diff --git a/kupfer/pretty.py b/kupfer/pretty.py
index 37d30a3..55ad43a 100644
--- a/kupfer/pretty.py
+++ b/kupfer/pretty.py
@@ -2,7 +2,6 @@ from __future__ import print_function
 
 debug = False
 
-import functools
 import sys
 import traceback
 
@@ -25,7 +24,6 @@ class OutputMixin (object):
 		"""
 		sep = kwargs.get("sep", " ")
 		end = kwargs.get("end", "\n")
-		stritems = (str(it) for it in items)
 		self._output_core("", sep, end, sys.stdout, *items)
 
 	def output_exc(self, exc_info=None):
diff --git a/kupfer/ui/browser.py b/kupfer/ui/browser.py
index 2196198..80ca9d5 100644
--- a/kupfer/ui/browser.py
+++ b/kupfer/ui/browser.py
@@ -2,7 +2,6 @@
 
 import itertools
 import math
-import os
 import signal
 import sys
 import textwrap
diff --git a/kupfer/ui/keybindings.py b/kupfer/ui/keybindings.py
index 70efc58..0459058 100644
--- a/kupfer/ui/keybindings.py
+++ b/kupfer/ui/keybindings.py
@@ -1,7 +1,6 @@
 import gobject
 
 from kupfer import pretty
-from kupfer import kupferstring
 
 KEYBINDING_DEFAULT = 1
 KEYBINDING_MAGIC = 2
diff --git a/kupfer/ui/preferences.py b/kupfer/ui/preferences.py
index 0177f27..b7337b8 100644
--- a/kupfer/ui/preferences.py
+++ b/kupfer/ui/preferences.py
@@ -14,12 +14,10 @@ from kupfer import scheduler, kupferstring
 from kupfer import kupferui
 from kupfer.core import settings, plugins, relevance, sources
 from kupfer.ui import keybindings
-from kupfer.ui import uievents
 from kupfer.ui.credentials_dialog import ask_user_credentials
 from kupfer.ui import getkey_dialog
 from kupfer.ui import accelerators
 from kupfer import plugin_support
-from kupfer import terminal
 
 # index in GtkNotebook
 PLUGIN_LIST_PAGE = 2
@@ -250,7 +248,6 @@ class PreferencesWindowController (pretty.OutputMixin):
 			setctl.set_directories(have)
 
 	def remove_directory_model(self, rowiter, store=True):
-		dirpath = self.dir_store.get_value(rowiter, 0)
 		self.dir_store.remove(rowiter)
 		if store:
 			have = list(os.path.normpath(row[0]) for row in self.dir_store)
@@ -311,7 +308,7 @@ class PreferencesWindowController (pretty.OutputMixin):
 		if keystr:
 			self.entrykeybinding.set_text(keystr)
 			self.output_debug("Try set keybinding with", keystr)
-			succ = keybindings.bind_key(keystr)
+			keybindings.bind_key(keystr)
 			setctl = settings.GetSettingsController()
 			setctl.set_keybinding(keystr)
 
@@ -486,7 +483,6 @@ class PreferencesWindowController (pretty.OutputMixin):
 				plugins.action_decorators_attribute,
 				plugins.text_sources_attribute)
 				)
-		all_items = list()
 		vbox = gtk.VBox()
 		vbox.set_property("spacing", 5)
 
@@ -584,7 +580,6 @@ class PreferencesWindowController (pretty.OutputMixin):
 		if not plugin_settings:
 			return None
 
-		info = self._plugin_info_for_id(plugin_id)
 		title_label = gtk.Label()
 		# TRANS: Plugin-specific configuration (header)
 		title_label.set_markup(u"<b>%s</b>" % _("Configuration"))
diff --git a/kupfer/ui/progress_dialog.py b/kupfer/ui/progress_dialog.py
index 710f6aa..fb84f8e 100644
--- a/kupfer/ui/progress_dialog.py
+++ b/kupfer/ui/progress_dialog.py
@@ -3,7 +3,7 @@ import functools
 import glib
 import gtk
 
-from kupfer import version, config, kupferstring
+from kupfer import version, config
 
 def idle_call(func):
 	@functools.wraps(func)
diff --git a/kupfer/uiutils.py b/kupfer/uiutils.py
index ee4fdc5..eda205b 100644
--- a/kupfer/uiutils.py
+++ b/kupfer/uiutils.py
@@ -6,7 +6,6 @@ purpose), but care should be taken to only call UI functions from the main
 (default) thread.
 """
 
-import glib
 import gtk
 import pango
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]