from common.exceptions import GajimGeneralException as GajimGeneralException -> from common.exceptions import GajimGeneralException

src/config.py

@@ -39,7 +39,7 @@ from common import gajim
 from common import connection
 from common import passwords
 
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 #---------- PreferencesWindow class -------------#
 class PreferencesWindow:

src/conversation_textview.py

@@ -31,7 +31,7 @@ from calendar import timegm
 from common.fuzzyclock import FuzzyClock
 
 from htmltextview import HtmlTextView
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 class ConversationTextview:
 	'''Class for the conversation textview (where user reads already said messages)

src/dialogs.py

@@ -40,7 +40,7 @@ from advanced import AdvancedConfigurationWindow
 
 from common import gajim
 from common import helpers
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 class EditGroupsDialog:
 	'''Class for the edit group dialog window'''

src/disco.py

@@ -49,7 +49,7 @@ import gtkgui_helpers
 
 from common import gajim
 from common import xmpp
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 # Dictionary mapping category, type pairs to browser class, image pairs.
 # This is a function, so we can call it after the classes are declared.

src/groupchat_control.py

@@ -39,7 +39,7 @@ from common import helpers
 from chat_control import ChatControl
 from chat_control import ChatControlBase
 from conversation_textview import ConversationTextview
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 #(status_image, type, nick, shown_nick)
 (

src/roster_window.py

@@ -36,7 +36,7 @@ import notify
 from common import gajim
 from common import helpers
 from common import passwords
-from common.exceptions import GajimGeneralException as GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 from message_window import MessageWindowMgr
 from chat_control import ChatControl