Menu
▾
▴
[Pywebsvcs-checkins] SF.net SVN: pywebsvcs:[1491] trunk/zsi
|
From: <bov...@us...> - 2009-05-18 19:48:39
|
Revision: 1491
http://pywebsvcs.svn.sourceforge.net/pywebsvcs/?rev=1491&view=rev
Author: boverhof
Date: 2009-05-18 19:48:29 +0000 (Mon, 18 May 2009)
Log Message:
-----------
M test/wsdl2py/wsdl/test_SubstitutionGroup.xsd
M ZSI/TCcompound.py
Changes:
-- formerly: parse all items, set into a dict, then loop on that dict and set all items on pyobj
-- now: parse all items, set in pyobj directly, if no pyclass return "pyobj.__dict__"
Wildcards (any):
-- formerly: parse, then set them last
-- now: parse & set them inorder
Unittest change:
-- was actually wrong since it was an extension of a type that had a wildcard
-- remove wildcard declaration in base so "child" can be parsed by the "extension" element
Modified Paths:
--------------
trunk/zsi/ZSI/TCcompound.py
trunk/zsi/test/wsdl2py/wsdl/test_SubstitutionGroup.xsd
Modified: trunk/zsi/ZSI/TCcompound.py
===================================================================
--- trunk/zsi/ZSI/TCcompound.py 2009-04-27 19:14:49 UTC (rev 1490)
+++ trunk/zsi/ZSI/TCcompound.py 2009-05-18 19:48:29 UTC (rev 1491)
@@ -92,6 +92,7 @@
elements.
'''
logger = _GetLogger('ZSI.TCcompound.ComplexType')
+ class _DictHolder: pass
def __init__(self, pyclass, ofwhat, pname=None, inorder=False, inline=False,
mutable=True, mixed=False, mixed_aname='_text', **kw):
@@ -156,17 +157,26 @@
if self.nilled(elt, ps): return Nilled
# Create the object.
- v = {}
+ if self.pyclass:
+ # type definition must be informed of element tag (nspname,pname),
+ # element declaration is initialized with a tag.
+ try:
+ pyobj = self.pyclass()
+ except Exception, e:
+ raise TypeError("Constructing element (%s,%s) with pyclass(%s), %s" \
+ %(self.nspname, self.pname, self.pyclass.__name__, str(e)))
+ else:
+ pyobj = ComplexType._DictHolder()
# parse all attributes contained in attribute_typecode_dict (user-defined attributes),
# the values (if not None) will be keyed in self.attributes dictionary.
attributes = self.parse_attributes(elt, ps)
if attributes:
- v[self.attrs_aname] = attributes
+ setattr(pyobj, self.attrs_aname, attributes)
#MIXED
if self.mixed is True:
- v[self.mixed_aname] = self.simple_value(elt,ps, mixed=True)
+ setattr(pyobj, self.mixed_aname, self.simple_value(elt,ps, mixed=True))
# Clone list of kids (we null it out as we process)
c, crange = c[:], range(len(c))
@@ -194,6 +204,9 @@
if what.name_match(c_elt):
match = True
value = what.parse(c_elt, ps)
+ elif isinstance(what,AnyElement):
+ match = True
+ value = what.parse(c_elt, ps)
else:
# substitutionGroup head must be a global element declaration
# if successful delegate to matching GED
@@ -207,14 +220,15 @@
if match:
if what.maxOccurs > 1:
- if v.has_key(what.aname):
- v[what.aname].append(value)
+ attr = getattr(pyobj, what.aname, None)
+ if attr is not None:
+ attr.append(value)
else:
- v[what.aname] = [value]
+ setattr(pyobj, what.aname, [value])
c[j] = None
continue
else:
- v[what.aname] = value
+ setattr(pyobj, what.aname, value)
c[j] = None
break
@@ -226,48 +240,15 @@
raise EvaluateException('Out of order complexType',
ps.Backtrace(c_elt))
else:
- # only supporting 1 <any> declaration in content.
- if isinstance(what,AnyElement):
- any = what
- elif hasattr(what, 'default'):
- v[what.aname] = what.default
- elif what.minOccurs > 0 and not v.has_key(what.aname):
+ if hasattr(what, 'default'):
+ setattr(pyobj, what.aname, what.default)
+ elif what.minOccurs > 0 and not hasattr(pyobj, what.aname):
raise EvaluateException('Element "' + what.aname + \
'" missing from complexType', ps.Backtrace(elt))
- # Look for wildcards and unprocessed children
- # XXX Stick all this stuff in "any", hope for no collisions
- if any is not None:
- occurs = 0
- v[any.aname] = []
- for j,c_elt in [ (j, c[j]) for j in crange if c[j] ]:
- value = any.parse(c_elt, ps)
- if any.maxOccurs == UNBOUNDED or any.maxOccurs > 1:
- v[any.aname].append(value)
- else:
- v[any.aname] = value
+ if isinstance(pyobj, ComplexType._DictHolder):
+ return pyobj.__dict__
- occurs += 1
-
- # No such thing as nillable <any>
- if any.maxOccurs == 1 and occurs == 0:
- v[any.aname] = None
- elif occurs < any.minOccurs or (any.maxOccurs!=UNBOUNDED and any.maxOccurs<occurs):
- raise EvaluateException('occurances of <any> elements(#%d) bound by (%d,%s)' %(
- occurs, any.minOccurs,str(any.maxOccurs)), ps.Backtrace(elt))
-
- if not self.pyclass:
- return v
-
- # type definition must be informed of element tag (nspname,pname),
- # element declaration is initialized with a tag.
- try:
- pyobj = self.pyclass()
- except Exception, e:
- raise TypeError("Constructing element (%s,%s) with pyclass(%s), %s" \
- %(self.nspname, self.pname, self.pyclass.__name__, str(e)))
- for key in v.keys():
- setattr(pyobj, key, v[key])
return pyobj
def serialize(self, elt, sw, pyobj, inline=False, name=None, **kw):
Modified: trunk/zsi/test/wsdl2py/wsdl/test_SubstitutionGroup.xsd
===================================================================
--- trunk/zsi/test/wsdl2py/wsdl/test_SubstitutionGroup.xsd 2009-04-27 19:14:49 UTC (rev 1490)
+++ trunk/zsi/test/wsdl2py/wsdl/test_SubstitutionGroup.xsd 2009-05-18 19:48:29 UTC (rev 1491)
@@ -9,7 +9,6 @@
<xsd:complexType name='baseType'>
<xsd:sequence>
<xsd:element name="base" type='xsd:string'/>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
</xsd:sequence>
</xsd:complexType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
