Changeset 54:03ec57713c90 in ralphm-patches


Ignore:
Timestamp:
Nov 2, 2011, 9:36:54 AM (11 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

Upstreamed Request patches, split out c2s patches in managable chunks, prepare for release of Wokkel 0.7.0.

Files:
7 added
5 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • roster_item.patch

    r50 r54  
    1 diff -r c103529d9f46 wokkel/im.py
    2 --- a/wokkel/im.py      Wed May 25 20:24:36 2011 +0200
    3 +++ b/wokkel/im.py      Wed May 25 20:26:47 2011 +0200
     1Clean up of RosterItem and RosterClientProtocol.
     2
     3`RosterItem`:
     4 * Renamed attributes `jid` and `ask` to `entity` and
     5   `pendingOut` respectively.
     6 * Can represent roster items to be removed or that have been removed.
     7 * Now has `fromElement` and `toElement` methods.
     8
     9`RosterClientProtocol`:
     10
     11 * Roster returned from `getRoster` is now indexed by `JID`s (instead of
     12   the `unicode` representation of the JID.
     13 * `onRosterSet` and `onRosterRemove` can raise `RosterPushIgnored` to
     14   return a `service-unavailable` stanza error.
     15
     16diff -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
    419@@ -7,21 +7,25 @@
    520 XMPP IM protocol support.
    … …  
    243258         @type entity: L{jid.JID}
    244259         """
    245 diff -r c103529d9f46 wokkel/test/test_im.py
    246 --- a/wokkel/test/test_im.py    Wed May 25 20:24:36 2011 +0200
    247 +++ b/wokkel/test/test_im.py    Wed May 25 20:26:47 2011 +0200
     260diff -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
    248263@@ -7,13 +7,14 @@
    249264 

  • roster_item_more.patch

    r50 r54  
    11# HG changeset patch
    2 # Parent 2741eaf2b765b6b175a9da29669c23ce13e2a14c
     2# Parent a8623e33ce6e62e39e0049451c5f65016c8b30b7
     3Record sender on received roster sets to support alternative roster sources.
    34
    4 diff -r 2741eaf2b765 wokkel/im.py
    5 --- a/wokkel/im.py      Wed May 25 20:26:47 2011 +0200
    6 +++ b/wokkel/im.py      Wed May 25 20:27:04 2011 +0200
     5TODO: roster item removal notifications.
     6
     7diff -r a8623e33ce6e wokkel/im.py
     8--- a/wokkel/im.py      Wed Oct 05 09:29:18 2011 +0200
     9+++ b/wokkel/im.py      Wed Oct 05 09:32:22 2011 +0200
    710@@ -371,6 +371,12 @@
    811     @ivar groups: Set of groups this contact is categorized in. Groups are
    … …  
    4649         if item.remove:
    4750             d = defer.maybeDeferred(self.onRosterRemove, item.entity)
    48 diff -r 2741eaf2b765 wokkel/test/test_im.py
    49 --- a/wokkel/test/test_im.py    Wed May 25 20:26:47 2011 +0200
    50 +++ b/wokkel/test/test_im.py    Wed May 25 20:27:04 2011 +0200
     51diff -r a8623e33ce6e wokkel/test/test_im.py
     52--- a/wokkel/test/test_im.py    Wed Oct 05 09:29:18 2011 +0200
     53+++ b/wokkel/test/test_im.py    Wed Oct 05 09:32:22 2011 +0200
    5154@@ -764,9 +764,9 @@
    5255         return d

  • roster_server.patch

    r51 r54  
    11Add server side support for the roster protocol.
    22
    3 diff -r 6604e0dc687c wokkel/im.py
    4 --- a/wokkel/im.py      Wed Jun 01 09:35:07 2011 +0200
    5 +++ b/wokkel/im.py      Wed Jun 01 21:13:19 2011 +0200
     3 * Implements roster get by calling `getRoster` and using the returned `list`
     4   of `RosterItem`s to send back the roster.
     5
     6TODO:
     7 * Add more docstrings.
     8 * Use `dict` instead of `list` as return value of `getRoster`.
     9 * Add support for roster sets?
     10
     11diff -r e3c41b054210 wokkel/im.py
     12--- a/wokkel/im.py      Wed Oct 05 09:32:22 2011 +0200
     13+++ b/wokkel/im.py      Wed Oct 05 09:38:26 2011 +0200
    614@@ -23,6 +23,7 @@
    715 NS_ROSTER = 'jabber:iq:roster'
    … …  
    5361+    def getRoster(self, entity):
    5462+        raise NotImplementedError()
    55 diff -r 6604e0dc687c wokkel/test/test_im.py
    56 --- a/wokkel/test/test_im.py    Wed Jun 01 09:35:07 2011 +0200
    57 +++ b/wokkel/test/test_im.py    Wed Jun 01 21:13:19 2011 +0200
     63diff -r e3c41b054210 wokkel/test/test_im.py
     64--- a/wokkel/test/test_im.py    Wed Oct 05 09:32:22 2011 +0200
     65+++ b/wokkel/test/test_im.py    Wed Oct 05 09:38:26 2011 +0200
    5866@@ -844,3 +844,80 @@
    5967         d.addCallback(cb)

  • series

    r51 r54  
    1 copy_xmppim.patch
    2 jid_cleanup.patch
     1pubsub_request_options.patch
     2release-0.7.0.patch
     3
     4copy_xmppim.patch #+c2s
     5jid_cleanup.patch #+c2s
    36roster_item.patch #+c2s
    47roster_item_more.patch #+c2s
    58roster_server.patch #+c2s
    6 xmpp_client_service.patch #+c2s
    7 
    8 request-tracking.patch #+request
    9 request-xmpphandler.patch #+request
    10 request-stanza.patch #+request
    11 disco-addressing.patch #+request
     9router_unknown.patch #+c2s
     10client_listen_authenticator.patch #+c2s
     11c2s_server_factory.patch #+c2s
     12session_manager.patch #+c2s
     13c2s_stanza_handlers.patch #+c2s
    1214
    1315pubsub_resource_example.patch
Note: See TracChangeset for help on using the changeset viewer.