Changeset 72:727b4d29c48e in ralphm-patches for listening-authenticator-stream-features.patch

Timestamp:

Jan 27, 2013, 10:40:32 PM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Major reworking of avatars, session manager and stanza handlers.

File:

• listening-authenticator-stream-features.patch (modified) (9 diffs)

listening-authenticator-stream-features.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 9393ad83138bbe6ab1c5249a6a115b8e56144622
+# Parent 840b96390047670c5209195300f902689c18b12f
 Add FeatureListeningAuthenticator.
 
@@ -9 +9 @@
 --- a/wokkel/generic.py
 +++ b/wokkel/generic.py
-@@ -10,13 +10,13 @@
+@@ -10,7 +10,7 @@
  from zope.interface import implements
  
@@ -15 +15 @@
 -from twisted.python import reflect
 +from twisted.python import log, reflect
+ from twisted.python.deprecate import deprecated
+ from twisted.python.versions import Version
  from twisted.words.protocols.jabber import error, jid, xmlstream
- from twisted.words.protocols.jabber.xmlstream import toResponse
+@@ -18,7 +18,7 @@
  from twisted.words.xish import domish, utility
  from twisted.words.xish.xmlstream import BootstrapMixin
@@ -25 +27 @@
  
  IQ_GET = '/iq[@type="get"]'
-@@ -25,6 +25,8 @@
+@@ -27,6 +27,8 @@
  NS_VERSION = 'jabber:iq:version'
  VERSION = IQ_GET + '/query[@xmlns="' + NS_VERSION + '"]'
@@ -34 +36 @@
      """
      Parse serialized XML into a DOM structure.
-@@ -327,3 +329,287 @@
- 
-     def clientConnectionFailed(self, connector, reason):
-         self.deferred.errback(reason)
-+
-+
-+
+@@ -332,6 +334,290 @@
+ 
+ 
+ 
 +class TestableXmlStream(xmlstream.XmlStream):
 +    """
@@ -322 +321 @@
 +        self._initializers = self.getInitializers()
 +        self._initializeStream()
++
++
++
+ @deprecated(Version("Wokkel", 0, 8, 0), "unicode.encode('idna')")
+ def prepareIDNName(name):
+     """
 diff --git a/wokkel/iwokkel.py b/wokkel/iwokkel.py
 --- a/wokkel/iwokkel.py
@@ -388 +393 @@
 --- a/wokkel/test/test_generic.py
 +++ b/wokkel/test/test_generic.py
-@@ -5,11 +5,16 @@
- Tests for L{wokkel.generic}.
- """
+@@ -7,14 +7,19 @@
+ 
+ import re
  
 +from zope.interface import verify
 +
 +from twisted.internet import defer
+ from twisted.python import deprecate
+ from twisted.python.versions import Version
 +from twisted.test import proto_helpers
  from twisted.trial import unittest
+ from twisted.trial.util import suppress as SUPPRESS
  from twisted.words.xish import domish
  from twisted.words.protocols.jabber.jid import JID
@@ -406 +414 @@
  
  NS_VERSION = 'jabber:iq:version'
-@@ -268,3 +273,331 @@
-         The default is no timeout.
-         """
-         self.assertIdentical(None, self.request.timeout)
-+
-+
-+
+@@ -276,6 +281,334 @@
+ 
+ 
+ 
 +class BaseReceivingInitializerTest(unittest.TestCase):
 +    """
@@ -738 +743 @@
 +
 +        self.xmlstream.assertStreamError(self, condition='invalid-namespace')
++
++
++
+ class PrepareIDNNameTests(unittest.TestCase):
+     """
+     Tests for L{wokkel.generic.prepareIDNName}.