Changeset 80:3ee3e922549d for wokkel/pubsub.py

Timestamp:

Jan 5, 2010, 2:55:40 PM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Move findForm to wokkel.data_form

File:

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

wokkel/pubsub.py

@@ -253 +253 @@
 
 
-    @staticmethod
-    def _findForm(element, formNamespace):
-        """
-        Find a Data Form.
-
-        Look for an element that represents a Data Form with the specified
-        form namespace as a child element of the given element.
-        """
-        if not element:
-            return None
-
-        form = None
-        for child in element.elements():
-            try:
-                form = data_form.Form.fromElement(child)
-            except data_form.Error:
-                continue
-
-            if form.formNamespace != NS_PUBSUB_NODE_CONFIG:
-                continue
-
-        return form
-
-
     def _parse_node(self, verbElement):
         """
@@ -367 +343 @@
         Parse node type out of a request for the default node configuration.
         """
-        form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
+        form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
         if form and form.formType == 'submit':
             values = form.getValues()
@@ -379 +355 @@
         Parse options out of a request for setting the node configuration.
         """
-        form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
+        form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
         if form:
             if form.formType == 'submit':
@@ -438 +414 @@
 
     def _parse_options(self, verbElement):
-        form = PubSubRequest._findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
+        form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
         if form:
             if form.formType == 'submit':