Changeset 165:76a61f5aa343 for wokkel/server.py

Timestamp:

Jan 22, 2012, 2:51:25 PM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Cleanups leading up to Wokkel 0.7.0.

As we now depend on Twisted 10.0.0 or higher, the following classes and
interfaces were deprecated:

• wokkel.compat.BootstrapMixin?
• wokkel.compat.XmlStreamServerFactory?
• wokkel.iwokkel.IXMPPHandler
• wokkel.iwokkel.IXMPPHandlerCollection
• wokkel.subprotocols.XMPPHandlerCollection

This also resolves all Pyflakes warnings, changes links for www.xmpp.org to
xmpp.org and fixes the copyright notice in LICENSE to include 2012.

File:

• wokkel/server.py (modified) (6 diffs)

wokkel/server.py

@@ -24 +24 @@
 from zope.interface import implements
 
-from twisted.application import service
 from twisted.internet import defer, reactor
 from twisted.names.srvconnect import SRVConnector
@@ -32 +31 @@
 
 from wokkel.generic import DeferredXmlStreamFactory, XmlPipe
-from wokkel.compat import XmlStreamServerFactory
 
 NS_DIALBACK = 'jabber:server:dialback'
@@ -41 +39 @@
 
     The dialback key is generated using the algorithm described in
-    U{XEP-0185<http://www.xmpp.org/extensions/xep-0185.html>}. The used
+    U{XEP-0185<http://xmpp.org/extensions/xep-0185.html>}. The used
     terminology for the parameters is described in RFC-3920.
 
@@ -478 +476 @@
 
 
-class XMPPS2SServerFactory(XmlStreamServerFactory):
+class XMPPS2SServerFactory(xmlstream.XmlStreamServerFactory):
     """
     XMPP Server-to-Server Server factory.
@@ -493 +491 @@
             return XMPPServerListenAuthenticator(service)
 
-        XmlStreamServerFactory.__init__(self, authenticatorFactory)
+        xmlstream.XmlStreamServerFactory.__init__(self, authenticatorFactory)
         self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
                           self.onConnectionMade)
@@ -702 +700 @@
             try:
                 sender = jid.internJID(stanzaFrom)
-                recipient = jid.internJID(stanzaTo)
+                jid.internJID(stanzaTo)
             except jid.InvalidFormat:
                 log.msg("Dropping error stanza with malformed JID")