Changeset 57:0d8b6cf41728 in ralphm-patches for roster_item.patch

Timestamp:

Mar 28, 2012, 1:43:02 PM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Wokkel 0.7.0 release, clean up various patches.

File:

• roster_item.patch (modified) (8 diffs)

roster_item.patch

@@ -14 +14 @@
    return a `service-unavailable` stanza error.
 
-diff -r 2e2717d3db8f wokkel/im.py
---- a/wokkel/im.py      Wed Oct 05 09:15:44 2011 +0200
-+++ b/wokkel/im.py      Wed Oct 05 09:29:18 2011 +0200
-@@ -7,21 +7,25 @@
+diff -r a3c50205821b wokkel/im.py
+--- a/wokkel/im.py      Wed Mar 28 13:13:06 2012 +0200
++++ b/wokkel/im.py      Wed Mar 28 13:17:05 2012 +0200
+@@ -7,21 +7,26 @@
  XMPP IM protocol support.
  
  This module provides generic implementations for the protocols defined in
--U{RFC 3921<http://www.xmpp.org/rfcs/rfc3921.html>} (XMPP IM).
+-U{RFC 3921<http://xmpp.org/rfcs/rfc3921.html>} (XMPP IM).
 -
 -All of it should eventually move to Twisted.
@@ -28 +28 @@
  
 +from twisted.internet import defer
++from twisted.words.protocols.jabber import error
  from twisted.words.protocols.jabber import jid
-+from twisted.words.protocols.jabber import error
  from twisted.words.xish import domish
  
  from wokkel.compat import IQ
  from wokkel.generic import ErrorStanza, Stanza
--from wokkel.subprotocols import XMPPHandler
-+from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
++from wokkel.subprotocols import IQHandlerMixin
+ from wokkel.subprotocols import XMPPHandler
  
  NS_XML = 'http://www.w3.org/XML/1998/namespace'
@@ -47 +47 @@
      """
      Stanza of kind presence.
-@@ -349,8 +353,8 @@
+@@ -377,8 +382,8 @@
  
      This represents one contact from an XMPP contact list known as roster.
@@ -58 +58 @@
      @type name: C{unicode}
      @ivar subscriptionTo: Subscription state to contact's presence. If C{True},
-@@ -360,47 +364,99 @@
+@@ -388,47 +393,99 @@
      @ivar subscriptionFrom: Contact's subscription state. If C{True}, the
                              contact is subscribed to the presence information
@@ -186 +186 @@
  
      def getRoster(self):
-@@ -415,8 +471,8 @@
+@@ -443,8 +500,8 @@
              roster = {}
              for element in domish.generateElementsQNamed(result.query.children,
@@ -197 +197 @@
              return roster
  
-@@ -437,32 +493,36 @@
+@@ -465,32 +522,36 @@
          """
          iq = IQ(self.xmlstream, 'set')
@@ -247 +247 @@
          @type item: L{RosterItem}
          """
-@@ -472,6 +532,10 @@
+@@ -500,6 +561,10 @@
          """
          Called when a roster push for the removal of an item was received.
@@ -258 +258 @@
          @type entity: L{jid.JID}
          """
-diff -r 2e2717d3db8f wokkel/test/test_im.py
---- a/wokkel/test/test_im.py    Wed Oct 05 09:15:44 2011 +0200
-+++ b/wokkel/test/test_im.py    Wed Oct 05 09:29:18 2011 +0200
+diff -r a3c50205821b wokkel/test/test_im.py
+--- a/wokkel/test/test_im.py    Wed Mar 28 13:13:06 2012 +0200
++++ b/wokkel/test/test_im.py    Wed Mar 28 13:17:05 2012 +0200
 @@ -7,13 +7,14 @@