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

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:

• findform.patch (modified) (4 diffs)

findform.patch

@@ -1 @@
-diff -r 031a0ad83156 -r fda6b92d81a1 wokkel/data_form.py
---- a/wokkel/data_form.py       Wed Dec 30 21:37:33 2009 +0100
-+++ b/wokkel/data_form.py       Wed Dec 30 21:39:55 2009 +0100
-@@ -616,3 +616,24 @@
+Move findForm to wokkel.data_form
+
+diff -r ff70bda5117e wokkel/data_form.py
+--- a/wokkel/data_form.py       Fri Jan 01 16:03:51 2010 +0100
++++ b/wokkel/data_form.py       Fri Jan 01 16:16:09 2010 +0100
+@@ -657,3 +657,24 @@
  
          for field in filtered:
@@ -27 +29 @@
 +
 +    return None
-diff -r 031a0ad83156 -r fda6b92d81a1 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Dec 30 21:37:33 2009 +0100
-+++ b/wokkel/pubsub.py  Wed Dec 30 21:39:55 2009 +0100
+diff -r ff70bda5117e wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Fri Jan 01 16:03:51 2010 +0100
++++ b/wokkel/pubsub.py  Fri Jan 01 16:16:09 2010 +0100
 @@ -252,30 +252,6 @@
          self.verb = verb
@@ -77 +79 @@
 +        form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
          if form:
-             if form.formType in ('submit', 'cancel'):
-                 self.options = form
-@@ -435,7 +411,7 @@
+             if form.formType == 'submit':
+                 self.options = form.getValues()
+@@ -437,7 +413,7 @@
  
  
@@ -86 +88 @@
 +        form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
          if form:
-             if form.formType not in ('submit', 'cancel'):
-                 raise BadRequest(text="Unexpected form type %r" % form.formType)
+             if form.formType == 'submit':
+                 self.options = form.getValues()