Changeset 105:5d8f1609aaf3 for wokkel/pubsub.py

Timestamp:

Nov 9, 2011, 6:44:36 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Children:

155:8b2ed9549399, 159:bbb746f79718

Message:

Allow wokkel.data_form.Form to be used as a read-only dict.

In [1334124db2fd] wokkel.pubsub.PubSubRequest.options was changed to be a
Form instead of dictionary, which makes existing code using that field to be
incompatible.

To reduce the impact of that change, this change implements various methods in
wokkel.data_form.Form to emulate a read-only dictionary. It now maps the
name of each field to its value, similar to the dictionary returned from
getValues. The latter is now identical to dict(form).

• * *

Address incompatible change concerning PubSubRequest?.options.

In changeset [1334124db2fd], PubSubRequest.options was changed to hold the
wokkel.data_form.Form that represents the data form sent in the original
request. This makes it easier to type check the form in a step separate from
parsing the request. However, this is an incompatible change.

To remedy this, we move the form to optionsForm and make options a property
that returns the values of the form.

File:

• wokkel/pubsub.py (modified) (7 diffs)

wokkel/pubsub.py

@@ -385 +385 @@
         """
         form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-        if form and form.formType == 'submit':
+        if form is not None and form.formType == 'submit':
             values = form.getValues()
             self.nodeType = values.get('pubsub#node_type', 'leaf')
@@ -397 +397 @@
         """
         form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-        if form:
+        if form is not None:
             if form.formType in ('submit', 'cancel'):
                 self.options = form
@@ -413 +413 @@
             if element.uri == NS_PUBSUB and element.name == 'configure':
                 form = data_form.findForm(element, NS_PUBSUB_NODE_CONFIG)
-                if form:
+                if form is not None:
                     if form.formType != 'submit':
                         raise BadRequest(text=u"Unexpected form type '%s'" %
@@ -497 +497 @@
         """
         form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
-        if form:
+        if form is not None:
             if form.formType in ('submit', 'cancel'):
                 self.options = form
@@ -516 +516 @@
                 form = data_form.findForm(element,
                                           NS_PUBSUB_SUBSCRIBE_OPTIONS)
-                if form:
+                if form is not None:
                     if form.formType != 'submit':
                         raise BadRequest(text=u"Unexpected form type '%s'" %
@@ -527 +527 @@
 
     def _render_optionsWithSubscribe(self, verbElement):
-        if self.options:
+        if self.options is not None:
             optionsElement = verbElement.parent.addElement('options')
             self._render_options(optionsElement)
@@ -1195 +1195 @@
 
             handler = getattr(self, handlerName)
-
             args = [getattr(request, arg) for arg in argNames]
-            if 'options' in argNames:
-                args[argNames.index('options')] = request.options.getValues()
-
             d = handler(*args)