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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • roster_item.patch

    r54 r57  
    1414   return a `service-unavailable` stanza error.
    1515
    16 diff -r 2e2717d3db8f wokkel/im.py
    17 --- a/wokkel/im.py      Wed Oct 05 09:15:44 2011 +0200
    18 +++ b/wokkel/im.py      Wed Oct 05 09:29:18 2011 +0200
    19 @@ -7,21 +7,25 @@
     16diff -r a3c50205821b wokkel/im.py
     17--- a/wokkel/im.py      Wed Mar 28 13:13:06 2012 +0200
     18+++ b/wokkel/im.py      Wed Mar 28 13:17:05 2012 +0200
     19@@ -7,21 +7,26 @@
    2020 XMPP IM protocol support.
    2121 
    2222 This module provides generic implementations for the protocols defined in
    23 -U{RFC 3921<http://www.xmpp.org/rfcs/rfc3921.html>} (XMPP IM).
     23-U{RFC 3921<http://xmpp.org/rfcs/rfc3921.html>} (XMPP IM).
    2424-
    2525-All of it should eventually move to Twisted.
     
    2828 
    2929+from twisted.internet import defer
     30+from twisted.words.protocols.jabber import error
    3031 from twisted.words.protocols.jabber import jid
    31 +from twisted.words.protocols.jabber import error
    3232 from twisted.words.xish import domish
    3333 
    3434 from wokkel.compat import IQ
    3535 from wokkel.generic import ErrorStanza, Stanza
    36 -from wokkel.subprotocols import XMPPHandler
    37 +from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
     36+from wokkel.subprotocols import IQHandlerMixin
     37 from wokkel.subprotocols import XMPPHandler
    3838 
    3939 NS_XML = 'http://www.w3.org/XML/1998/namespace'
     
    4747     """
    4848     Stanza of kind presence.
    49 @@ -349,8 +353,8 @@
     49@@ -377,8 +382,8 @@
    5050 
    5151     This represents one contact from an XMPP contact list known as roster.
     
    5858     @type name: C{unicode}
    5959     @ivar subscriptionTo: Subscription state to contact's presence. If C{True},
    60 @@ -360,47 +364,99 @@
     60@@ -388,47 +393,99 @@
    6161     @ivar subscriptionFrom: Contact's subscription state. If C{True}, the
    6262                             contact is subscribed to the presence information
     
    186186 
    187187     def getRoster(self):
    188 @@ -415,8 +471,8 @@
     188@@ -443,8 +500,8 @@
    189189             roster = {}
    190190             for element in domish.generateElementsQNamed(result.query.children,
     
    197197             return roster
    198198 
    199 @@ -437,32 +493,36 @@
     199@@ -465,32 +522,36 @@
    200200         """
    201201         iq = IQ(self.xmlstream, 'set')
     
    247247         @type item: L{RosterItem}
    248248         """
    249 @@ -472,6 +532,10 @@
     249@@ -500,6 +561,10 @@
    250250         """
    251251         Called when a roster push for the removal of an item was received.
     
    258258         @type entity: L{jid.JID}
    259259         """
    260 diff -r 2e2717d3db8f wokkel/test/test_im.py
    261 --- a/wokkel/test/test_im.py    Wed Oct 05 09:15:44 2011 +0200
    262 +++ b/wokkel/test/test_im.py    Wed Oct 05 09:29:18 2011 +0200
     260diff -r a3c50205821b wokkel/test/test_im.py
     261--- a/wokkel/test/test_im.py    Wed Mar 28 13:13:06 2012 +0200
     262+++ b/wokkel/test/test_im.py    Wed Mar 28 13:17:05 2012 +0200
    263263@@ -7,13 +7,14 @@
    264264 
Note: See TracChangeset for help on using the changeset viewer.