diff --git a/terminatorlib/__init__.py b/terminatorlib/__init__.py index bb2dee20..314dc331 100644 --- a/terminatorlib/__init__.py +++ b/terminatorlib/__init__.py @@ -16,5 +16,3 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA """Terminator by Chris Jones """ - -from version import APP_NAME, APP_VERSION diff --git a/terminatorlib/config.py b/terminatorlib/config.py index 036042e5..9cd11261 100755 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -55,7 +55,6 @@ from copy import copy from configobj.configobj import ConfigObj, flatten_errors from configobj.validate import Validator from borg import Borg -from factory import Factory from util import dbg, err, DEBUG, get_config_dir, dict_diff DEFAULTS = { @@ -481,7 +480,6 @@ class ConfigBase(Borg): return(True) if __name__ == '__main__': - import sys import doctest (failed, attempted) = doctest.testmod() print "%d/%d tests failed" % (failed, attempted) diff --git a/terminatorlib/plugin.py b/terminatorlib/plugin.py index 99ab1798..1731f780 100755 --- a/terminatorlib/plugin.py +++ b/terminatorlib/plugin.py @@ -136,7 +136,6 @@ class MenuItem(Plugin): raise NotImplementedError if __name__ == '__main__': - import sys import doctest sys.path.insert(0, 'plugins') (failed, attempted) = doctest.testmod() diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index 28282afc..d7299083 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -4,10 +4,9 @@ import os import gtk import gobject -from util import dbg, err +from util import dbg import config from keybindings import Keybindings, KeymapError -from version import APP_NAME, APP_VERSION from translation import _ from newterminator import Terminator diff --git a/terminatorlib/searchbar.py b/terminatorlib/searchbar.py index 9f0da760..46b65900 100755 --- a/terminatorlib/searchbar.py +++ b/terminatorlib/searchbar.py @@ -8,7 +8,6 @@ import gobject from translation import _ from config import Config -from util import dbg # pylint: disable-msg=R0904 class Searchbar(gtk.HBox): diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py index 2b648586..1d0155c7 100755 --- a/terminatorlib/terminal.py +++ b/terminatorlib/terminal.py @@ -10,10 +10,10 @@ pygtk.require('2.0') import gtk import gobject import pango -import re import subprocess +import urllib -from util import dbg, err, gerr, widget_pixbuf, get_top_window +from util import dbg, err, gerr, get_top_window import util from config import Config from cwd import get_default_cwd