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


Ignore:
Timestamp:
Mar 28, 2012, 1:43:02 PM (11 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
  • pubsub-item.patch

    r47 r57  
    1 diff -r d16bd03316ad wokkel/generic.py
    2 --- a/wokkel/generic.py Mon Feb 28 09:31:41 2011 +0100
    3 +++ b/wokkel/generic.py Mon Feb 28 09:43:34 2011 +0100
    4 @@ -38,13 +38,12 @@
     1diff -r 2bc0db311133 wokkel/generic.py
     2--- a/wokkel/generic.py Wed Mar 28 13:28:55 2012 +0200
     3+++ b/wokkel/generic.py Wed Mar 28 13:30:27 2012 +0200
     4@@ -34,13 +34,12 @@
    55     @return: The DOM structure, or C{None} on empty or incomplete input.
    66     @rtype: L{domish.Element}
     
    2020 
    2121 
    22 diff -r d16bd03316ad wokkel/pubsub.py
    23 --- a/wokkel/pubsub.py  Mon Feb 28 09:31:41 2011 +0100
    24 +++ b/wokkel/pubsub.py  Mon Feb 28 09:43:34 2011 +0100
     22diff -r 2bc0db311133 wokkel/pubsub.py
     23--- a/wokkel/pubsub.py  Wed Mar 28 13:28:55 2012 +0200
     24+++ b/wokkel/pubsub.py  Wed Mar 28 13:30:27 2012 +0200
    2525@@ -157,33 +157,56 @@
    2626 
     
    6161         """
    6262-        @param id: optional item identifier
    63 -        @type id: L{unicode}
     63-        @type id: C{unicode}
    6464-        @param payload: optional item payload. Either as a domish element, or
    6565-                        as serialized XML.
    66 -        @type payload: object providing L{domish.IElement} or L{unicode}.
     66-        @type payload: object providing L{domish.IElement} or C{unicode}.
    6767+        Render to a DOM representation.
    6868+
     
    9898 
    9999 
    100 @@ -351,7 +374,13 @@
     100@@ -362,7 +385,13 @@
    101101         self.items = []
    102102         for element in verbElement.elements():
     
    113113 
    114114     def _render_items(self, verbElement):
    115 @@ -360,8 +389,7 @@
     115@@ -371,8 +400,7 @@
    116116         """
    117117         if self.items:
     
    123123 
    124124     def _parse_jid(self, verbElement):
    125 @@ -1307,8 +1335,7 @@
     125@@ -1319,8 +1347,7 @@
    126126         items["node"] = request.nodeIdentifier
    127127 
     
    133133         return response
    134134 
    135 @@ -1359,8 +1386,7 @@
     135@@ -1371,8 +1398,7 @@
    136136                                                nodeIdentifier, subscriber,
    137137                                                subscriptions)
     
    143143 
    144144 
    145 diff -r d16bd03316ad wokkel/test/test_pubsub.py
    146 --- a/wokkel/test/test_pubsub.py        Mon Feb 28 09:31:41 2011 +0100
    147 +++ b/wokkel/test/test_pubsub.py        Mon Feb 28 09:43:34 2011 +0100
     145diff -r 2bc0db311133 wokkel/test/test_pubsub.py
     146--- a/wokkel/test/test_pubsub.py        Wed Mar 28 13:28:55 2012 +0200
     147+++ b/wokkel/test/test_pubsub.py        Wed Mar 28 13:30:27 2012 +0200
    148148@@ -115,6 +115,30 @@
    149149 
Note: See TracChangeset for help on using the changeset viewer.