Changeset 26:59ace4d1df68 in ralphm-patches for pubsub-item.patch

Timestamp:

Jan 1, 2010, 4:18:52 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Clean up patches, more tests, adjust copyright statements to new year.

File:

• pubsub-item.patch (modified) (7 diffs)

pubsub-item.patch

@@ -1 @@
-diff -r 2919e60d3588 -r 90bd422b8ac6 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Mon Dec 28 12:13:34 2009 +0100
-+++ b/wokkel/pubsub.py  Mon Dec 28 21:19:34 2009 +0100
+diff -r e58b9f2cf8a3 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Fri Jan 01 01:34:14 2010 +0100
++++ b/wokkel/pubsub.py  Fri Jan 01 11:12:36 2010 +0100
 @@ -119,33 +119,47 @@
  
@@ -41 +41 @@
 +        L{Item} is usable in all contexts involving items.
 +
-+        @param namespace: The namespace of the item. Usually L{'NS_PUBSUB'} or
-+            L{'NS_PUBSUB_EVENT'}.
-+        @type: C{unicode}.
-+        @rtype: L{domish.Element}.
++        @param namespace: The namespace of the item. Usually L{NS_PUBSUB} or
++            L{NS_PUBSUB_EVENT}.
++        @type: C{unicode}
++        @rtype: L{domish.Element}
          """
 +        element = domish.Element((namespace, 'item'))
@@ -68 +68 @@
  
  
-@@ -333,7 +347,13 @@
+@@ -309,7 +323,13 @@
          self.items = []
          for element in verbElement.elements():
@@ -83 +83 @@
  
      def _render_items(self, verbElement):
-@@ -342,7 +362,7 @@
+@@ -318,7 +338,7 @@
          """
          if self.items:
@@ -92 +92 @@
  
      def _parse_jid(self, verbElement):
-@@ -1105,7 +1125,7 @@
+@@ -1124,7 +1144,7 @@
          items["node"] = request.nodeIdentifier
  
@@ -101 +101 @@
          return response
  
-diff -r 2919e60d3588 -r 90bd422b8ac6 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Mon Dec 28 12:13:34 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Mon Dec 28 21:19:34 2009 +0100
-@@ -331,7 +331,6 @@
+diff -r e58b9f2cf8a3 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Fri Jan 01 01:34:14 2010 +0100
++++ b/wokkel/test/test_pubsub.py        Fri Jan 01 11:12:36 2010 +0100
+@@ -365,7 +365,6 @@
          items = list(domish.generateElementsQNamed(child.children,
                                                     'item', NS_PUBSUB))
@@ -112 +112 @@
          response = toResponse(iq, 'result')
          self.stub.send(response)
-@@ -634,8 +633,8 @@
+@@ -699,8 +698,8 @@
  
          request = pubsub.PubSubRequest.fromElement(parseXml(xml))