From 1c30aa44c270626740c713b22371cd1ffc230c54 Mon Sep 17 00:00:00 2001 From: jortel Date: Thu, 6 May 2010 23:58:11 +0000 Subject: Undo changes to literal marshalling prefix qualification. --- suds/mx/literal.py | 5 +---- suds/xsd/sxbase.py | 11 ----------- suds/xsd/sxbasic.py | 11 +---------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/suds/mx/literal.py b/suds/mx/literal.py index b6c0c7e..937ad8e 100644 --- a/suds/mx/literal.py +++ b/suds/mx/literal.py @@ -143,10 +143,7 @@ class Typed(Core): # by the schema (elementFormDefault). # ns = content.type.namespace() - qualify = \ - ( content.type.form_qualified or - content.type.element() == 1) - if qualify: + if content.type.form_qualified: node = Element(content.tag, ns=ns) node.addPrefix(ns[0], ns[1]) else: diff --git a/suds/xsd/sxbase.py b/suds/xsd/sxbase.py index 62c2d7f..643a118 100644 --- a/suds/xsd/sxbase.py +++ b/suds/xsd/sxbase.py @@ -218,17 +218,6 @@ class SchemaObject(object): """ return self.cache.get(nobuiltin, self) - def element(self): - """ - Get whether this is an - @return: code. - - 0=not an element - - 1=root, - - 2=non-root - @rtype: int - """ - return 0 - def sequence(self): """ Get whether this is an diff --git a/suds/xsd/sxbasic.py b/suds/xsd/sxbasic.py index 72cd324..0b536d2 100644 --- a/suds/xsd/sxbasic.py +++ b/suds/xsd/sxbasic.py @@ -387,12 +387,6 @@ class Element(TypedContent): def childtags(self): return ('attribute', 'simpleType', 'complexType', 'any',) - def element(self): - if self in self.schema.children: - return 1 - else: - return 2 - def extension(self): for c in self.rawchildren: if c.extension(): @@ -800,10 +794,7 @@ class Factory: types[c.qname] = c for i in imports: children.remove(i) - s = set() - for c in children: - s.add(c) - return (s, imports, attributes, elements, types, groups, agrps) + return (children, imports, attributes, elements, types, groups, agrps) -- cgit v1.2.1