From 9031b2b1af6d8ab4803cb4282af1528c8ea7fc33 Mon Sep 17 00:00:00 2001 From: Joshua Boverhof Date: Sat, 16 Oct 2004 01:15:47 +0000 Subject: [PATCH] ---------------------------------------------------------------------- Modified Files: WSDLTools.py -- forgot to look for 2004 WS-Actions. ---------------------------------------------------------------------- --- WSDLTools.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/WSDLTools.py b/WSDLTools.py index 82d937b..4faa5fe 100755 --- a/WSDLTools.py +++ b/WSDLTools.py @@ -476,7 +476,9 @@ class PortType(Element): docs = GetDocumentation(item) msgref = DOM.getAttr(item, 'message') message = ParseQName(msgref, item) - action = DOM.getAttr(item, 'Action', WSA.ADDRESS, None) + action = DOM.getAttr(item, 'Action', WSA.ADDRESS2004, None) + if not action: + action = DOM.getAttr(item, 'Action', WSA.ADDRESS, None) operation.setInput(message, name, docs, action) item = DOM.getElement(element, 'output', None, None) @@ -485,7 +487,9 @@ class PortType(Element): docs = GetDocumentation(item) msgref = DOM.getAttr(item, 'message') message = ParseQName(msgref, item) - action = DOM.getAttr(item, 'Action', WSA.ADDRESS, None) + action = DOM.getAttr(item, 'Action', WSA.ADDRESS2004, None) + if not action: + action = DOM.getAttr(item, 'Action', WSA.ADDRESS, None) operation.setOutput(message, name, docs, action) for item in DOM.getElements(element, 'fault', None): @@ -493,7 +497,9 @@ class PortType(Element): docs = GetDocumentation(item) msgref = DOM.getAttr(item, 'message') message = ParseQName(msgref, item) - action = DOM.getAttr(item, 'Action', WSA.ADDRESS, None) + action = DOM.getAttr(item, 'Action', WSA.ADDRESS2004, None) + if not action: + action = DOM.getAttr(item, 'Action', WSA.ADDRESS, None) operation.addFault(message, name, docs, action)