[thorstenp] remove useless import

25 files changed, 13 insertions, 45 deletions

diff --git a/src/common/caps.py b/src/common/caps.py
index 4473bc93e..8fde2bbff 100644
--- a/src/common/caps.py
+++ b/src/common/caps.py
@@ -24,7 +24,6 @@
 ##
 
 from itertools import *
-import xmpp
 import xmpp.features_nb
 import gajim
 import helpers
diff --git a/src/common/defs.py b/src/common/defs.py
index 55a2b92bd..5d633587e 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -23,8 +23,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import re
-
 docdir = '../'
 datadir = '../'
 
diff --git a/src/common/xmpp/auth_nb.py b/src/common/xmpp/auth_nb.py
index f4e43c87c..91af93537 100644
--- a/src/common/xmpp/auth_nb.py
+++ b/src/common/xmpp/auth_nb.py
@@ -17,7 +17,6 @@
 Provides library with all Non-SASL and SASL authentication mechanisms.
 Can be used both for client and transport authentication.
 '''
-import sys
 from protocol import *
 from auth import *
 from client import PlugIn
diff --git a/src/common/xmpp/client.py b/src/common/xmpp/client.py
index 4a1c8b7e8..a71a132df 100644
--- a/src/common/xmpp/client.py
+++ b/src/common/xmpp/client.py
@@ -21,7 +21,6 @@ examples of xmpppy structures usage.
 These classes can be used for simple applications "AS IS" though.
 """
 
-import socket
 import debug
 Debug=debug
 Debug.DEBUGGING_IS_ON=1
diff --git a/src/common/xmpp/client_nb.py b/src/common/xmpp/client_nb.py
index 39861240c..a47f9eea2 100644
--- a/src/common/xmpp/client_nb.py
+++ b/src/common/xmpp/client_nb.py
@@ -23,9 +23,6 @@ examples of xmpppy structures usage.
 These classes can be used for simple applications "AS IS" though.
 '''
 
-import socket
-import debug
-
 import transports_nb, dispatcher_nb, auth_nb, roster_nb
 from client import *
 
diff --git a/src/common/xmpp/debug.py b/src/common/xmpp/debug.py
index 640f520bd..fc3458d45 100644
--- a/src/common/xmpp/debug.py
+++ b/src/common/xmpp/debug.py
@@ -41,8 +41,6 @@ import traceback
 import time
 import os
 
-import types
-
 if 'TERM' in os.environ:
     colors_enabled=True
 else:
diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py
index 9cc9630c9..7ddd79e9d 100644
--- a/src/common/xmpp/protocol.py
+++ b/src/common/xmpp/protocol.py
@@ -19,7 +19,7 @@ Protocol module contains tools that is needed for processing of
 xmpp-related data structures.
 """
 
-from simplexml import Node,NodeBuilder,ustr
+from simplexml import Node, NodeBuilder
 import time
 NS_ACTIVITY     ='http://jabber.org/protocol/activity'                  # XEP-0108
 NS_ADDRESS      ='http://jabber.org/protocol/address'                   # XEP-0033
diff --git a/src/common/xmpp/transports.py b/src/common/xmpp/transports.py
index e588222af..86d1097cf 100644
--- a/src/common/xmpp/transports.py
+++ b/src/common/xmpp/transports.py
@@ -27,11 +27,13 @@ Transports are stackable so you - f.e. TLS use HTPPROXYsocket or TCPsocket as mo
 Also exception 'error' is defined to allow capture of this module specific exceptions.
 """
 
-import socket,select,base64,dispatcher
+import socket
+import select
+import base64
+import dispatcher
 from simplexml import ustr
 from client import PlugIn
 from protocol import *
-import sys
 import os
 import errno
 
diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py
index 548dd5b68..8975a9351 100644
--- a/src/common/xmpp/transports_nb.py
+++ b/src/common/xmpp/transports_nb.py
@@ -14,7 +14,9 @@
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ##   GNU General Public License for more details.
 
-import socket,select,base64,dispatcher_nb
+import socket
+import base64
+import dispatcher_nb
 import struct
 from simplexml import ustr
 from client import PlugIn
@@ -28,7 +30,6 @@ import errno
 import time
 
 import traceback
-import thread
 
 import logging
 log = logging.getLogger('gajim.c.x.transports_nb')
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py
index 870c4c505..16da6722e 100644
--- a/src/common/zeroconf/connection_handlers_zeroconf.py
+++ b/src/common/zeroconf/connection_handlers_zeroconf.py
@@ -23,7 +23,6 @@
 ## along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import os
 import time
 import socket
 
@@ -482,4 +481,4 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream, connecti
 	def remove_transfer(self, file_props, remove_from_list = True):
 		pass
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/src/common/zeroconf/zeroconf_bonjour.py
index c6e281ad2..fb8eba701 100644
--- a/src/common/zeroconf/zeroconf_bonjour.py
+++ b/src/common/zeroconf/zeroconf_bonjour.py
@@ -18,7 +18,6 @@
 ##
 
 from common import gajim
-import sys
 import select
 import re
 from string import split
@@ -335,4 +334,4 @@ class Zeroconf:
 		return True
 
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/config.py b/src/config.py
index fbb3973aa..1f4a7386e 100644
--- a/src/config.py
+++ b/src/config.py
@@ -57,7 +57,6 @@ from common import connection
 from common import passwords
 from common import zeroconf
 from common import dataforms
-from common import pep
 
 from common.exceptions import GajimGeneralException
 
diff --git a/src/features_window.py b/src/features_window.py
index df2e2910e..79e53d52a 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -28,8 +28,6 @@ import sys
 import gtk
 import gtkgui_helpers
 
-import dialogs
-
 from common import gajim
 from common import helpers
 
@@ -187,7 +185,6 @@ class FeaturesWindow:
 	def gpg_available(self):
 		if os.name == 'nt':
 			return False
-		from common import gajim
 		return gajim.HAVE_GPG
 
 	def network_manager_available(self):
@@ -300,7 +297,6 @@ class FeaturesWindow:
 		return False
 
 	def pycrypto_available(self):
-		from common import gajim
 		return gajim.HAVE_PYCRYPTO
 
 	def docutils_available(self):
@@ -311,7 +307,6 @@ class FeaturesWindow:
 		return True
 
 	def pysexy_available(self):
-		from common import gajim
 		return gajim.HAVE_PYSEXY
 
 # vim: se ts=3:
diff --git a/src/gajim-remote.py b/src/gajim-remote.py
index f6ee2d968..378aa5abe 100755
--- a/src/gajim-remote.py
+++ b/src/gajim-remote.py
@@ -28,7 +28,6 @@
 # gajim-remote help will show you the D-BUS API of Gajim
 
 import sys
-import os
 import locale
 import signal
 signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
diff --git a/src/gajim.py b/src/gajim.py
index 76b115825..0fba84be8 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -251,7 +251,6 @@ from session import ChatControlSession
 import common.sleepy
 
 from common.xmpp import idlequeue
-from common.zeroconf import connection_zeroconf
 from common import nslookup
 from common import proxy65_manager
 from common import socks5
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 767f0849c..9946808f3 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -45,7 +45,6 @@ from common import helpers
 
 from chat_control import ChatControl
 from chat_control import ChatControlBase
-from conversation_textview import ConversationTextview
 from common.exceptions import GajimGeneralException
 
 #(status_image, type, nick, shown_nick)
diff --git a/src/groups.py b/src/groups.py
index a827ed288..604c73efb 100644
--- a/src/groups.py
+++ b/src/groups.py
@@ -21,8 +21,6 @@
 
 '''Window to create new post for discussion groups service.'''
 
-import gtk
-
 from common import gajim, xmpp
 import gtkgui_helpers
 
diff --git a/src/ipython_view.py b/src/ipython_view.py
index caf4d5f54..66e3bc50e 100644
--- a/src/ipython_view.py
+++ b/src/ipython_view.py
@@ -48,7 +48,6 @@ import sys
 import os
 import pango
 from StringIO import StringIO
-import thread
 
 try:
   import IPython
diff --git a/src/music_track_listener.py b/src/music_track_listener.py
index d8e27a1c6..b55e16fc9 100644
--- a/src/music_track_listener.py
+++ b/src/music_track_listener.py
@@ -23,7 +23,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import os
 import gobject
 if __name__ == '__main__':
 	# install _() func before importing dbus_support
diff --git a/src/negotiation.py b/src/negotiation.py
index 5e7f15ded..bd5a32123 100644
--- a/src/negotiation.py
+++ b/src/negotiation.py
@@ -22,8 +22,6 @@
 import gtkgui_helpers
 import dataforms_widget
 
-import dialogs
-
 from common import dataforms
 from common import gajim
 from common import xmpp
diff --git a/src/osx/growl/Growl.py b/src/osx/growl/Growl.py
index b9ed533ba..f035e69df 100644
--- a/src/osx/growl/Growl.py
+++ b/src/osx/growl/Growl.py
@@ -14,7 +14,6 @@ try:
     import _growl
 except Exception:
     _growl = False
-import types
 import struct
 import md5
 import socket
@@ -243,4 +242,4 @@ class GrowlNotifier(object):
     def notifyCB(self, userdata):
         print "Got notify in pyland", userdata
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/osx/growler.py b/src/osx/growler.py
index 62573d5a3..0a1dceb1a 100644
--- a/src/osx/growler.py
+++ b/src/osx/growler.py
@@ -1,6 +1,6 @@
 import sys, os
 from growl.Growl import GrowlNotifier
-from common import gajim, helpers
+from common import gajim
 
 
 if sys.platform != "darwin":
@@ -62,4 +62,4 @@ def filterString(string):
 	return string
 
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/src/profile_window.py b/src/profile_window.py
index 710deac5b..9734baba5 100644
--- a/src/profile_window.py
+++ b/src/profile_window.py
@@ -33,8 +33,6 @@ import dialogs
 import vcard
 
 from common import gajim
-from common.i18n import Q_
-
 
 class ProfileWindow:
 	'''Class for our information window'''
diff --git a/src/roster_window.py b/src/roster_window.py
index 4e514f8b4..0a993b062 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -50,7 +50,6 @@ import cell_renderer_image
 import tooltips
 import message_control
 import adhoc_commands
-import notify
 import features_window
 
 from common import gajim
@@ -62,13 +61,10 @@ from common import pep
 
 from message_window import MessageWindowMgr
 
-from session import ChatControlSession
-
 from common import dbus_support
 if dbus_support.supported:
 	from music_track_listener import MusicTrackListener
 	import dbus
-from lastfm_track_listener import LastFMTrackListener
 
 from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC
 from common.pep import MOODS, ACTIVITIES
diff --git a/src/vcard.py b/src/vcard.py
index 0685976bf..eeb34b9a5 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -39,7 +39,6 @@ import locale
 import os
 
 import gtkgui_helpers
-import message_control
 
 from common import helpers
 from common import gajim