diff plugins/plugin_xep_0096.py @ 39:2e3411a6baad

Wix: external server management in gateways manager, SàT: bug fixes in gateway management - SàT: from twisted.words.protocols.jabber.error module imported as jab_error to avoir name colision with error log method - XEP_0100 plugin: added errback for disco info - XEP_0077 plugin: registration callback now look for "x" element (data form: see XEP-0004), and send an error message if it can't find it. - Wix: added fields for browsing external server gateways
author Goffi <goffi@goffi.org>
date Thu, 17 Dec 2009 17:29:02 +1100
parents bb72c29f3432
children 4392f1fdb064
line wrap: on
line diff
--- a/plugins/plugin_xep_0096.py	Thu Dec 17 13:13:13 2009 +1100
+++ b/plugins/plugin_xep_0096.py	Thu Dec 17 17:29:02 2009 +1100
@@ -22,7 +22,8 @@
 from logging import debug, info, error
 from twisted.words.xish import domish
 from twisted.internet import protocol
-from twisted.words.protocols.jabber import client, jid, xmlstream, error
+from twisted.words.protocols.jabber import client, jid, xmlstream
+from twisted.words.protocols.jabber import error as jab_error
 import os.path
 from twisted.internet import reactor #FIXME best way ???
 import pdb