[thorstenp] remove useless import

src/common/caps.py

@@ -24,8 +24,6 @@
 ##
 
 from itertools import *
-import xmpp
-import xmpp.features_nb
 import gajim
 import helpers
 

src/common/defs.py

@@ -23,8 +23,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import re
-
 docdir = '../'
 datadir = '../'
 

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

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 *
 

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:

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

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
 

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')

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:
+# vim: se ts=3:

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:
+# vim: se ts=3:

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
 

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):
@@ -311,7 +308,6 @@ class FeaturesWindow:
 		return False
 
 	def pycrypto_available(self):
-		from common import gajim
 		return gajim.HAVE_PYCRYPTO
 
 	def docutils_available(self):
@@ -322,7 +318,6 @@ class FeaturesWindow:
 		return True
 
 	def pysexy_available(self):
-		from common import gajim
 		return gajim.HAVE_PYSEXY
 
 # vim: se ts=3:

src/gajim-remote.py

@@ -33,7 +33,7 @@ import signal
 signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
 
 from common import exceptions
-from common import i18n
+from common import i18n # This installs _() function
 
 try:
 	PREFERRED_ENCODING = locale.getpreferredencoding()

src/gajim.py

@@ -3168,7 +3168,8 @@ class Interface:
 		gajim.default_session_type = ChatControlSession
 		self.register_handlers()
 		if gajim.config.get('enable_zeroconf'):
-			gajim.connections[gajim.ZEROCONF_ACC_NAME] = common.zeroconf.connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME)
+			gajim.connections[gajim.ZEROCONF_ACC_NAME] = \
+				connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME)
 		for account in gajim.config.get_per('accounts'):
 			if not gajim.config.get_per('accounts', account, 'is_zeroconf'):
 				gajim.connections[account] = common.connection.Connection(account)

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)

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
 

src/gtkexcepthook.py

@@ -27,7 +27,7 @@ import threading
 
 import gtk
 import pango
-from common import i18n
+from common import i18n # installs _() function
 import dialogs
 
 from cStringIO import StringIO

src/ipython_view.py

@@ -48,7 +48,6 @@ import sys
 import os
 import pango
 from StringIO import StringIO
-import thread
 
 try:
   import IPython

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

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:
+# vim: se ts=3:

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:
+# vim: se ts=3:

src/profile_window.py

@@ -33,7 +33,6 @@ import dialogs
 import vcard
 
 from common import gajim
-from common.i18n import Q_
 
 
 class ProfileWindow:

src/roster_window.py

@@ -61,8 +61,6 @@ 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