source: ralphm-patches/py3-generic.patch @ 78:361e2111a663

# HG changeset patch
# Parent  4092375760243dbc2397107b9633729101590d49

diff --git a/wokkel/generic.py b/wokkel/generic.py
--- a/wokkel/generic.py
+++ b/wokkel/generic.py
@@ -7,6 +7,8 @@
 Generic XMPP protocol helpers.
 """
 
+from __future__ import division, absolute_import
+
 from zope.interface import implementer
 
 from twisted.internet import defer, protocol
@@ -112,16 +114,16 @@
 
         iq.handled = True
 
-    def getDiscoInfo(self, requestor, target, node):
+    def getDiscoInfo(self, requestor, target, nodeIdentifier=''):
         info = set()
 
-        if not node:
+        if not nodeIdentifier:
             from wokkel import disco
             info.add(disco.DiscoFeature(NS_VERSION))
 
         return defer.succeed(info)
 
-    def getDiscoItems(self, requestor, target, node):
+    def getDiscoItems(self, requestor, target, nodeIdentifier=''):
         return defer.succeed([])
 
 
diff --git a/wokkel/test/test_generic.py b/wokkel/test/test_generic.py
--- a/wokkel/test/test_generic.py
+++ b/wokkel/test/test_generic.py
@@ -5,9 +5,14 @@
 Tests for L{wokkel.generic}.
 """
 
+from __future__ import division, absolute_import
+
 import re
 
+from zope.interface.verify import verifyObject
+
 from twisted.python import deprecate
+from twisted.python.compat import unicode
 from twisted.python.versions import Version
 from twisted.trial import unittest
 from twisted.trial.util import suppress as SUPPRESS
@@ -15,6 +20,7 @@
 from twisted.words.protocols.jabber.jid import JID
 
 from wokkel import generic
+from wokkel.iwokkel import IDisco
 from wokkel.test.helpers import XmlStreamStub
 
 NS_VERSION = 'jabber:iq:version'
@@ -24,12 +30,22 @@
     Tests for L{wokkel.generic.VersionHandler}.
     """
 
+    def setUp(self):
+        self.protocol = generic.VersionHandler('Test', '0.1.0')
+
+
+    def test_interface(self):
+        """
+        L{generic.VersionHandler} implements {IDisco}.
+        """
+        verifyObject(IDisco, self.protocol)
+
+
     def test_onVersion(self):
         """
         Test response to incoming version request.
         """
         self.stub = XmlStreamStub()
-        self.protocol = generic.VersionHandler('Test', '0.1.0')
         self.protocol.xmlstream = self.stub.xmlstream
         self.protocol.send = self.stub.xmlstream.send
         self.protocol.connectionInitialized()
@@ -319,19 +335,10 @@
         """
         self.callDeprecated((Version("Wokkel", 0, 8, 0),
                              "unicode.encode('idna')"),
-                            generic.prepareIDNName, (b"example.com"))
+                            generic.prepareIDNName, ("example.com"))
     test_deprecated.suppress = []
 
 
-    def test_bytestring(self):
-        """
-        An ASCII-encoded byte string is left as-is.
-        """
-        name = b"example.com"
-        result = generic.prepareIDNName(name)
-        self.assertEqual(b"example.com", result)
-
-
     def test_unicode(self):
         """
         A unicode all-ASCII name is converted to an ASCII byte string.