From fe411d46d122b5cf1eb3df696dbae06626bd5d90 Mon Sep 17 00:00:00 2001 From: Luca Clementi Date: Tue, 7 Apr 2009 00:02:02 +0000 Subject: [PATCH] Bug fix in the File attachment --- Namespaces.py | 11 ++++++++--- XMLSchema.py | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Namespaces.py b/Namespaces.py index 85be392..46a8b05 100755 --- a/Namespaces.py +++ b/Namespaces.py @@ -24,9 +24,7 @@ except: XSD1 = "http://www.w3.org/1999/XMLSchema" XSD2 = "http://www.w3.org/2000/10/XMLSchema" XSD3 = "http://www.w3.org/2001/XMLSchema" - #AXIS attachment implementation details - AXIS = "http://xml.apache.org/xml-soap" - XSD_LIST = [ XSD1, XSD2, XSD3, AXIS] + XSD_LIST = [ XSD1, XSD2, XSD3] XSI1 = "http://www.w3.org/1999/XMLSchema-instance" XSI2 = "http://www.w3.org/2000/10/XMLSchema-instance" XSI3 = "http://www.w3.org/2001/XMLSchema-instance" @@ -142,6 +140,13 @@ class OASIS: BASEFAULTS = WSRF_V1_2.BASEFAULTS.XSD_DRAFT1 +class APACHE: + '''This name space is defined by AXIS and it is used for the TC in TCapache.py, + Map and file attachment (DataHandler) + ''' + AXIS_NS = "http://xml.apache.org/xml-soap" + + class WSTRUST: BASE = "http://schemas.xmlsoap.org/ws/2004/04/trust" ISSUE = "http://schemas.xmlsoap.org/ws/2004/04/trust/Issue" diff --git a/XMLSchema.py b/XMLSchema.py index b6bb87c..eb5b3fe 100755 --- a/XMLSchema.py +++ b/XMLSchema.py @@ -15,7 +15,7 @@ ident = "$Id$" import types, weakref, sys, warnings -from Namespaces import SCHEMA, XMLNS, SOAP +from Namespaces import SCHEMA, XMLNS, SOAP, APACHE from Utility import DOM, DOMException, Collection, SplitQName, basejoin from StringIO import StringIO @@ -37,7 +37,7 @@ ATTRIBUTE_GROUPS = 'attr_groups' ATTRIBUTES = 'attr_decl' ELEMENTS = 'elements' MODEL_GROUPS = 'model_groups' -BUILT_IN_NAMESPACES = [SOAP.ENC,] + SCHEMA.XSD_LIST +BUILT_IN_NAMESPACES = [SOAP.ENC,] + SCHEMA.XSD_LIST + [APACHE.AXIS_NS] def GetSchema(component): """convience function for finding the parent XMLSchema instance.