diff options
| author | jortel <devnull@localhost> | 2009-12-03 02:16:47 +0000 |
|---|---|---|
| committer | jortel <devnull@localhost> | 2009-12-03 02:16:47 +0000 |
| commit | 25830e72cc345b0f641bfd857f2b4bb2b96d1461 (patch) | |
| tree | 6457a4fdadd1928342b92b954ad0e473d7f40231 | |
| parent | b4c57963161c02297d47e7a2e4e35bae125e652c (diff) | |
| download | suds-25830e72cc345b0f641bfd857f2b4bb2b96d1461.tar.gz | |
Fix ticket 280. Make SchemaObject.qualify() idempotent and call qualify() on objects before they are marged.
| -rw-r--r-- | suds/__init__.py | 2 | ||||
| -rw-r--r-- | suds/xsd/sxbase.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/suds/__init__.py b/suds/__init__.py index 152ce45..05843cf 100644 --- a/suds/__init__.py +++ b/suds/__init__.py @@ -29,7 +29,7 @@ import sys # __version__ = '0.3.8' -__build__="(beta) R615-20091202" +__build__="(beta) R616-20091202" # # Exceptions diff --git a/suds/xsd/sxbase.py b/suds/xsd/sxbase.py index becfcb9..c03f525 100644 --- a/suds/xsd/sxbase.py +++ b/suds/xsd/sxbase.py @@ -353,6 +353,8 @@ class SchemaObject(object): ref = getattr(self, a) if ref is None: continue + if isqref(ref): + continue qref = qualify(ref, self.root, defns) log.debug('%s, convert %s="%s" to %s', self.id, a, ref, qref) setattr(self, a, qref) @@ -361,6 +363,7 @@ class SchemaObject(object): """ Merge another object as needed. """ + other.qualify() for n in ('name', 'qname', 'min', |