summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjortel <devnull@localhost>2010-05-06 23:58:11 +0000
committerjortel <devnull@localhost>2010-05-06 23:58:11 +0000
commit1c30aa44c270626740c713b22371cd1ffc230c54 (patch)
tree664771c26abf3bcc2d41948b959f92b2b7b23cd9
parent9eb5733b9c2364fb7696ffd0e62562cdaa054ce1 (diff)
downloadsuds-1c30aa44c270626740c713b22371cd1ffc230c54.tar.gz
Undo changes to literal marshalling prefix qualification.
-rw-r--r--suds/mx/literal.py5
-rw-r--r--suds/xsd/sxbase.py11
-rw-r--r--suds/xsd/sxbasic.py11
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 <xs:element/>
- @return: code.
- - 0=not an element
- - 1=root,
- - 2=non-root
- @rtype: int
- """
- return 0
-
def sequence(self):
"""
Get whether this is an <xs:sequence/>
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)