Changeset 195:ff66e31c8607

Timestamp:

Oct 3, 2016, 8:49:10 AM (4 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

rebase_source:

c3bf991ad5b37cfbd90262c6991f0686b0eefbe3

Message:

imported patch py3-generic.patch

Location:

wokkel

Files:

• generic.py (modified) (3 diffs)
• test/test_generic.py (modified) (5 diffs)

wokkel/generic.py

@@ -7 +7 @@
 Generic XMPP protocol helpers.
 """
+
+from __future__ import division, absolute_import
 
 from zope.interface import implementer
@@ -113 +115 @@
         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))
@@ -122 +124 @@
         return defer.succeed(info)
 
-    def getDiscoItems(self, requestor, target, node):
+    def getDiscoItems(self, requestor, target, nodeIdentifier=''):
         return defer.succeed([])
 

wokkel/test/test_generic.py

@@ -6 +6 @@
 """
 
+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
@@ -16 +21 @@
 
 from wokkel import generic
+from wokkel.iwokkel import IDisco
 from wokkel.test.helpers import XmlStreamStub
 
@@ -25 +31 @@
     """
 
+    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):
         """
@@ -30 +47 @@
         """
         self.stub = XmlStreamStub()
-        self.protocol = generic.VersionHandler('Test', '0.1.0')
         self.protocol.xmlstream = self.stub.xmlstream
         self.protocol.send = self.stub.xmlstream.send
@@ -320 +336 @@
         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)