Changeset 26:59ace4d1df68 in ralphm-patches for pubsub-request-options-form.patch


Ignore:
Timestamp:
Jan 1, 2010, 4:18:52 PM (12 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pubsub-request-options-form.patch

    r21 r26  
    1 diff -r 438b64816faa -r 4d1379394cda wokkel/pubsub.py
    2 --- a/wokkel/pubsub.py  Wed Dec 30 21:22:36 2009 +0100
    3 +++ b/wokkel/pubsub.py  Wed Dec 30 21:29:15 2009 +0100
    4 @@ -380,10 +380,8 @@
    5          """
    6          form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
     1diff -r 459a78aaec20 wokkel/pubsub.py
     2--- a/wokkel/pubsub.py  Fri Jan 01 16:17:05 2010 +0100
     3+++ b/wokkel/pubsub.py  Fri Jan 01 16:17:28 2010 +0100
     4@@ -356,10 +356,8 @@
     5         """
     6         form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
    77         if form:
    88-            if form.formType == 'submit':
     
    1515                 raise BadRequest(text="Unexpected form type %r" % form.formType)
    1616         else:
    17 @@ -439,12 +437,9 @@
     17@@ -415,12 +413,9 @@
    1818     def _parse_options(self, verbElement):
    19          form = PubSubRequest._findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
     19         form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
    2020         if form:
    2121-            if form.formType == 'submit':
     
    3030             raise BadRequest(text="Missing options form")
    3131 
    32 @@ -956,6 +951,8 @@
     32@@ -932,6 +927,8 @@
    3333             handlerName, argNames = self._legacyHandlers[request.verb]
    3434             handler = getattr(self, handlerName)
     
    3939 
    4040         # If needed, translate the result into a response
    41 @@ -1020,29 +1017,9 @@
     41@@ -996,29 +993,9 @@
    4242         return form
    4343 
     
    7272 
    7373     def _preProcess_default(self, resource, request):
    74 @@ -1073,12 +1050,11 @@
     74@@ -1049,12 +1026,11 @@
    7575 
    7676 
     
    8989 
    9090     def _toResponse_items(self, result, resource, request):
    91 diff -r 438b64816faa -r 4d1379394cda wokkel/test/test_pubsub.py
    92 --- a/wokkel/test/test_pubsub.py        Wed Dec 30 21:22:36 2009 +0100
    93 +++ b/wokkel/test/test_pubsub.py        Wed Dec 30 21:29:15 2009 +0100
     91diff -r 459a78aaec20 wokkel/test/test_pubsub.py
     92--- a/wokkel/test/test_pubsub.py        Fri Jan 01 16:17:05 2010 +0100
     93+++ b/wokkel/test/test_pubsub.py        Fri Jan 01 16:17:28 2010 +0100
     94@@ -1,4 +1,4 @@
     95-# Copyright (c) 2003-2009 Ralph Meijer
     96+# Copyright (c) 2003-2010 Ralph Meijer
     97 # See LICENSE for details.
     98 
     99 """
    94100@@ -805,7 +805,7 @@
    95101         self.assertEqual(JID('pubsub.example.org'), request.recipient)
Note: See TracChangeset for help on using the changeset viewer.