source:
ralphm-patches/findform.patch
@
26:59ace4d1df68
Last change on this file since 26:59ace4d1df68 was 26:59ace4d1df68, checked in by Ralph Meijer <ralphm@…>, 13 years ago | |
---|---|
File size: 2.9 KB |
-
wokkel/data_form.py
Move findForm to wokkel.data_form diff -r ff70bda5117e wokkel/data_form.py
a b 657 657 658 658 for field in filtered: 659 659 self.removeField(field) 660 661 662 def findForm(element, formNamespace): 663 """ 664 Find a Data Form. 665 666 Look for an element that represents a Data Form with the specified 667 form namespace as a child element of the given element. 668 """ 669 if not element: 670 return None 671 672 for child in element.elements(): 673 if (child.uri, child.name) == ((NS_X_DATA, 'x')): 674 form = Form.fromElement(child) 675 676 if (form.formNamespace == formNamespace or 677 not form.formNamespace and form.formType=='cancel'): 678 return form 679 680 return None -
wokkel/pubsub.py
diff -r ff70bda5117e wokkel/pubsub.py
a b 252 252 self.verb = verb 253 253 254 254 255 @staticmethod256 def _findForm(element, formNamespace):257 """258 Find a Data Form.259 260 Look for an element that represents a Data Form with the specified261 form namespace as a child element of the given element.262 """263 if not element:264 return None265 266 form = None267 for child in element.elements():268 try:269 form = data_form.Form.fromElement(child)270 except data_form.Error:271 continue272 273 if form.formNamespace != NS_PUBSUB_NODE_CONFIG:274 continue275 276 return form277 278 279 255 def _parse_node(self, verbElement): 280 256 """ 281 257 Parse the required node identifier out of the verbElement. … … 366 342 """ 367 343 Parse node type out of a request for the default node configuration. 368 344 """ 369 form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)345 form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG) 370 346 if form and form.formType == 'submit': 371 347 values = form.getValues() 372 348 self.nodeType = values.get('pubsub#node_type', 'leaf') … … 378 354 """ 379 355 Parse options out of a request for setting the node configuration. 380 356 """ 381 form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)357 form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG) 382 358 if form: 383 359 if form.formType == 'submit': 384 360 self.options = form.getValues() … … 437 413 438 414 439 415 def _parse_options(self, verbElement): 440 form = PubSubRequest._findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)416 form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS) 441 417 if form: 442 418 if form.formType == 'submit': 443 419 self.options = form.getValues()
Note: See TracBrowser
for help on using the repository browser.