Changeset 165:76a61f5aa343 for wokkel/generic.py

Timestamp:

Jan 22, 2012, 2:51:25 PM (8 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/generic.py (modified) (3 diffs)

wokkel/generic.py

@@ -15 +15 @@
 from twisted.words.protocols.jabber.xmlstream import toResponse
 from twisted.words.xish import domish, utility
-
-try:
-    from twisted.words.xish.xmlstream import BootstrapMixin
-except ImportError:
-    from wokkel.compat import BootstrapMixin
+from twisted.words.xish.xmlstream import BootstrapMixin
 
 from wokkel.iwokkel import IDisco
@@ -94 +90 @@
 
     This protocol is described in
-    U{XEP-0092<http://www.xmpp.org/extensions/xep-0092.html>}.
+    U{XEP-0092<http://xmpp.org/extensions/xep-0092.html>}.
     """
 
@@ -110 +106 @@
 
         query = response.addElement((NS_VERSION, "query"))
-        name = query.addElement("name", content=self.name)
-        version = query.addElement("version", content=self.version)
+        query.addElement("name", content=self.name)
+        query.addElement("version", content=self.version)
         self.send(response)