From a3537011bdd9af07e1207dc7989af4d48876bc8f Mon Sep 17 00:00:00 2001
From: Dave Kuhlman <dkuhlman@davekuhlman.org>
Date: Mon, 27 Aug 2018 14:54:59 -0700
Subject: [PATCH] v. 2.29.24 Changed namespace_ to namespaceprefix_ for
clarity
---
README.rst | 13 ++
generateDS.html | 6 +-
generateDS.py | 78 +++----
generateDS.txt | 2 +-
generateds_gui_notes.html | 6 +-
generateds_gui_notes.txt | 2 +-
gui/generateds_gui.py | 2 +-
librarytemplate_howto.html | 6 +-
librarytemplate_howto.txt | 2 +-
process_includes.py | 2 +-
setup.py | 2 +-
tests/OnePer/oneperType00_2One.py | 18 +-
tests/OnePer/oneperType01_2One.py | 30 +--
tests/OnePer/oneperType02_2One.py | 30 +--
tests/OnePer/oneperType03_2One.py | 30 +--
tests/abstract_type1_sup.py | 66 +++---
tests/annotations1_sup.py | 46 ++--
tests/anonymous_type1_sup.py | 62 +++---
tests/anysimpletype1_sup.py | 30 +--
tests/anywildcard1_sup.py | 96 ++++-----
tests/attr_groups1_sup.py | 14 +-
tests/cdata1_sup.py | 30 +--
tests/cleanupname1_sup.py | 94 ++++----
tests/defaults_cases1_sup.py | 78 +++----
tests/defaults_cases_always1_sup.py | 46 ++--
tests/defaults_cases_always2_sup.py | 46 ++--
tests/defaults_coverage1_sup.py | 46 ++--
tests/extensions1_sup.py | 178 +++++++--------
tests/ipo1_sup.py | 114 +++++-----
tests/ipo2_sup.py | 114 +++++-----
tests/mapcleanname1_sup.py | 112 +++++-----
tests/mixedcontent1_sup.py | 82 +++----
tests/mixedcontent2_sup.py | 82 +++----
tests/nested_def1_sup.py | 78 +++----
tests/out1_sup.py | 204 +++++++++---------
tests/people_procincl1_sup.py | 276 ++++++++++++------------
tests/prefix_classname1_sup.py | 204 +++++++++---------
tests/recursive_simpletype1_sup.py | 14 +-
tests/reference_simpletype1_sup.py | 14 +-
tests/rem_dup_elems1_sup.py | 30 +--
tests/simplecontent_restriction1_sup.py | 50 ++---
tests/simpletype_memberspecs1_sup.py | 28 +--
tests/simpletypes_other1_sup.py | 30 +--
tests/validate_simpletypes1_sup.py | 68 +++---
tests/validate_simpletypes2_sup.py | 68 +++---
tutorial/generateds_tutorial.html | 6 +-
tutorial/generateds_tutorial.txt | 2 +-
tutorial/generateds_tutorial.zip | Bin 48772 -> 48771 bytes
48 files changed, 1325 insertions(+), 1312 deletions(-)
diff --git a/README.rst b/README.rst
index e692f4d..011aaa9 100644
--- a/README.rst
+++ b/README.rst
@@ -141,6 +141,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.29.24 (08/27/2018)
+
+- Changed name of parameter in the export method from "namespace_"
+ to "namespaceprefix_" in an attempt to reduce confusion about its
+ use. It's value, if it has one, should be something like "abc:".
+ Thanks to Bernd Zimmermann for his advice and encouragement on
+ this.
+
Version 2.29.23 (08/16/2018)
- Added new command line option "--create-mandatory-children". If a
@@ -2264,3 +2272,8 @@ The following enhancements and fixes remain to be done:
Dave Kuhlman
dkuhlman@davekuhlman.org
http://www.davekuhlman.org
+
+.. A few dummy targets to eliminate docutils processing errors:
+
+.. _namespace:
+.. _namespaceprefix:
diff --git a/generateDS.html b/generateDS.html
index 6dda5e4..5d20287 100644
--- a/generateDS.html
+++ b/generateDS.html
@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.23</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.24</td>
</tr>
</tbody>
</table>
@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">August 16, 2018</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 27, 2018</td>
</tr>
</tbody>
</table>
@@ -3409,7 +3409,7 @@ following among others:</p>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateDS.txt">View document source</a>.
-Generated on: 2018-08-16 22:29 UTC.
+Generated on: 2018-08-27 21:50 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/generateDS.py b/generateDS.py
index 0f47548..02f8322 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -235,7 +235,7 @@ _log = logging.getLogger(__name__)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.29.23'
+VERSION = '2.29.24'
##VERSION##
BaseStrTypes = six.string_types
@@ -2067,9 +2067,6 @@ def generateExportFn_1(wrt, child, name, namespace, fill):
"input_name='%s')), eol_))\n" % \
(fill, child_ns, name, child_ns, name, mappedName, name, )
else:
- namespace = 'namespace_'
- if child.prefix and 'ref' in child.attrs:
- namespace = "'%s:'" % child.prefix
s1 = "%s outfile.write('<%s%s>%%s</%s%s>%%s' %% " \
"(self.gds_encode(self.gds_format_string(" \
"quote_xml(self.%s), " \
@@ -2153,27 +2150,27 @@ def generateExportFn_1(wrt, child, name, namespace, fill):
# name_type_problem
if False: # name == child.getType():
s1 = "%s self.%s.export(outfile, level, " \
- "namespace_, pretty_print=pretty_print)\n" % \
+ "namespaceprefix_, pretty_print=pretty_print)\n" % \
(fill, mappedName)
else:
- namespace = 'namespace_'
+ namespaceprefix = 'namespaceprefix_'
if child.prefix and 'ref' in child.attrs:
- namespace += "='%s:'" % child.prefix
+ namespaceprefix += "='%s:'" % child.prefix
s1 = "%s self.%s.export(outfile, level, %s, " \
"name_='%s', pretty_print=pretty_print)\n" % \
- (fill, mappedName, namespace, name)
+ (fill, mappedName, namespaceprefix, name)
wrt(s1)
# end generateExportFn_1
-def generateExportFn_2(wrt, child, name, namespace, fill):
+def generateExportFn_2(wrt, child, name, namespaceprefix, fill):
cleanName = cleanupName(name)
mappedName = mapName(cleanName)
child_type = child.getType()
if child.prefix and 'ref' in child.attrs:
child_ns = "%s:" % child.prefix
else:
- child_ns = namespace
+ child_ns = namespaceprefix
# fix_simpletype
wrt("%s for %s_ in self.%s:\n" % (fill, cleanName, mappedName, ))
if child_type == DateTimeType:
@@ -2275,27 +2272,27 @@ def generateExportFn_2(wrt, child, name, namespace, fill):
else:
# name_type_problem
if False: # name == child.getType():
- s1 = "%s %s_.export(outfile, level, namespace_, " \
+ s1 = "%s %s_.export(outfile, level, namespaceprefix_, " \
"pretty_print=pretty_print)\n" % (fill, cleanName)
else:
- namespace = 'namespace_'
+ namespaceprefix = 'namespaceprefix_'
if child.prefix and 'ref' in child.attrs:
- namespace += "='%s:'" % child.prefix
+ namespaceprefix += "='%s:'" % child.prefix
s1 = "%s %s_.export(outfile, level, %s, " \
"name_='%s', pretty_print=pretty_print)\n" % \
- (fill, cleanName, namespace, name)
+ (fill, cleanName, namespaceprefix, name)
wrt(s1)
# end generateExportFn_2
-def generateExportFn_3(wrt, child, name, namespace, fill):
+def generateExportFn_3(wrt, child, name, namespaceprefix, fill):
cleanName = cleanupName(name)
mappedName = mapName(cleanName)
child_type = child.getType()
if child.prefix and 'ref' in child.attrs:
child_ns = "%s:" % child.prefix
else:
- child_ns = namespace
+ child_ns = namespaceprefix
# fix_simpletype
default = child.getDefault()
if child_type == DateTimeType:
@@ -2454,16 +2451,17 @@ def generateExportFn_3(wrt, child, name, namespace, fill):
wrt("%s if self.%s is not None:\n" % (fill, mappedName))
# name_type_problem
if False: # name == child.getType():
- s1 = "%s self.%s.export(" \
- "outfile, level, namespace_, pretty_print=pretty_print)\n" % \
- (fill, mappedName)
+ s1 = ("%s self.%s.export("
+ "outfile, level, namespaceprefix_, "
+ "pretty_print=pretty_print)\n" % (
+ fill, mappedName))
else:
- namespace = 'namespace_'
+ namespaceprefix = 'namespaceprefix_'
if child.prefix and 'ref' in child.attrs:
- namespace += "='%s:'" % child.prefix
+ namespaceprefix += "='%s:'" % child.prefix
s1 = "%s self.%s.export(outfile, level, %s, " \
"name_='%s', pretty_print=pretty_print)\n" % \
- (fill, mappedName, namespace, name)
+ (fill, mappedName, namespaceprefix, name)
wrt(s1)
# end generateExportFn_3
@@ -2776,7 +2774,7 @@ def generateExportChildren(wrt, element, hasChildren, namespace):
wrt('%sif not fromsubclass_:\n' % (fill, ))
wrt("%s for item_ in self.content_:\n" % (fill, ))
wrt("%s item_.export(outfile, level, item_.name, "
- "namespace_, pretty_print=pretty_print)\n" % (fill, ))
+ "namespaceprefix_, pretty_print=pretty_print)\n" % (fill, ))
wrt('%sif pretty_print:\n' % (fill, ))
wrt("%s eol_ = '\\n'\n" % (fill, ))
wrt('%selse:\n' % (fill, ))
@@ -2799,13 +2797,13 @@ def generateExportChildren(wrt, element, hasChildren, namespace):
if abstract_child and child.getMaxOccurs() > 1:
wrt("%sfor %s_ in self.%s:\n" % (
fill, name, name,))
- wrt("%s %s_.export(outfile, level, namespace_, "
+ wrt("%s %s_.export(outfile, level, namespaceprefix_, "
"pretty_print=pretty_print)\n" % (
fill, name, ))
elif abstract_child:
wrt("%sif self.%s is not None:\n" % (fill, name, ))
wrt("%s self.%s.export(outfile, level, "
- "namespace_, "
+ "namespaceprefix_, "
"pretty_print=pretty_print)\n" % (
fill, name, ))
elif child.getMaxOccurs() > 1:
@@ -2822,11 +2820,11 @@ def generateExportChildren(wrt, element, hasChildren, namespace):
if any_type_child.getMaxOccurs() > 1:
wrt(' for obj_ in self.anytypeobjs_:\n')
wrt(" obj_.export(outfile, level, "
- "namespace_, pretty_print=pretty_print)\n")
+ "namespaceprefix_, pretty_print=pretty_print)\n")
else:
wrt(' if self.anytypeobjs_ is not None:\n')
wrt(" self.anytypeobjs_.export(outfile, "
- "level, namespace_, pretty_print=pretty_print)\n")
+ "level, namespaceprefix_, pretty_print=pretty_print)\n")
return hasChildren
# end generateExportChildren
@@ -2873,7 +2871,7 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
ns_def = 'xmlns:{}'.format(ns_prefix[0])
if ns_def not in nameSpacesDef:
nameSpacesDef += ' {}="{}"'.format(ns_def, ns_prefix[1])
- wrt(" def export(self, outfile, level, namespace_='%s', "
+ wrt(" def export(self, outfile, level, namespaceprefix_='%s', "
"name_='%s', namespacedef_='%s', pretty_print=True):\n" %
(namespace, encodedname, nameSpacesDef))
wrt(" imported_ns_def_ = GenerateDSNamespaceDefs_.get"
@@ -2888,11 +2886,11 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
wrt(" if self.original_tagname_ is not None:\n")
wrt(" name_ = self.original_tagname_\n")
wrt(' showIndent(outfile, level, pretty_print)\n')
- wrt(" outfile.write('<%s%s%s' % (namespace_, name_, "
+ wrt(" outfile.write('<%s%s%s' % (namespaceprefix_, name_, "
"namespacedef_ and ' ' + namespacedef_ or '', ))\n")
wrt(" already_processed = set()\n")
wrt(" self.exportAttributes(outfile, level, "
- "already_processed, namespace_, name_='%s')\n" %
+ "already_processed, namespaceprefix_, name_='%s')\n" %
(encodedname, ))
# fix_abstract
if base and base in ElementDict:
@@ -2903,10 +2901,11 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
if childCount == 0 and element.isMixed():
wrt(" outfile.write('>')\n")
wrt(" self.exportChildren(outfile, level + 1, "
- "namespace_, name_, pretty_print=pretty_print)\n")
+ "namespaceprefix_, name_, pretty_print=pretty_print)\n")
wrt(" outfile.write(self.convert_unicode("
"self.valueOf_))\n")
- wrt(" outfile.write('</%s%s>%s' % (namespace_, name_, eol_))\n")
+ wrt(" outfile.write('</%s%s>%s' % ("
+ "namespaceprefix_, name_, eol_))\n")
else:
wrt(" if self.hasContent_():\n")
# Added to keep value on the same line as the tag no children.
@@ -2918,17 +2917,17 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
else:
wrt(" outfile.write('>%s' % (eol_, ))\n")
wrt(" self.exportChildren(outfile, level + 1, "
- "namespace_='%s', name_='%s', pretty_print=pretty_print)\n" %
+ "namespaceprefix_='%s', name_='%s', pretty_print=pretty_print)\n" %
(namespace, encodedname))
# Put a condition on the indent to require children.
if childCount != 0:
wrt(' showIndent(outfile, level, pretty_print)\n')
- wrt(" outfile.write('</%s%s>%s' % (namespace_, "
+ wrt(" outfile.write('</%s%s>%s' % (namespaceprefix_, "
"name_, eol_))\n")
wrt(" else:\n")
wrt(" outfile.write('/>%s' % (eol_, ))\n")
wrt(" def exportAttributes(self, outfile, level, "
- "already_processed, namespace_='%s', name_='%s'):\n" %
+ "already_processed, namespaceprefix_='%s', name_='%s'):\n" %
(namespace, encodedname, ))
hasAttributes = 0
if element.getAnyAttribute():
@@ -2969,12 +2968,13 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
hasAttributes += 1
elName = element.getCleanName()
wrt(" super(%s%s, self).exportAttributes("
- "outfile, level, already_processed, namespace_, name_='%s')\n" %
- (prefix, elName, encodedname, ))
+ "outfile, level, already_processed, "
+ "namespaceprefix_, name_='%s')\n" % (
+ prefix, elName, encodedname, ))
hasAttributes += generateExportAttributes(wrt, element, hasAttributes)
if hasAttributes == 0:
wrt(" pass\n")
- wrt(" def exportChildren(self, outfile, level, namespace_='%s', "
+ wrt(" def exportChildren(self, outfile, level, namespaceprefix_='%s', "
"name_='%s', fromsubclass_=False, pretty_print=True):\n" %
(namespace, encodedname, ))
hasChildren = 0
@@ -2985,7 +2985,7 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
hasChildren += 1
elName = element.getCleanName()
wrt(" super(%s%s, self).exportChildren(outfile, level, "
- "namespace_, name_, True, pretty_print=pretty_print)\n" %
+ "namespaceprefix_, name_, True, pretty_print=pretty_print)\n" %
(prefix, elName, ))
hasChildren += generateExportChildren(wrt, element, hasChildren, namespace)
if childCount == 0: # and not element.isMixed():
diff --git a/generateDS.txt b/generateDS.txt
index df257a6..ecc0ff3 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
-:revision: 2.29.23
+:revision: 2.29.24
.. version
diff --git a/generateds_gui_notes.html b/generateds_gui_notes.html
index 4749cd3..f7b4cb2 100644
--- a/generateds_gui_notes.html
+++ b/generateds_gui_notes.html
@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.23</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.24</td>
</tr>
</tbody>
</table>
@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">August 16, 2018</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 27, 2018</td>
</tr>
</tbody>
</table>
@@ -401,7 +401,7 @@ $ mv generateds_gui.mo locale/ru/LC_MESSAGES/
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_gui_notes.txt">View document source</a>.
-Generated on: 2018-08-16 22:29 UTC.
+Generated on: 2018-08-27 21:50 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/generateds_gui_notes.txt b/generateds_gui_notes.txt
index 2bed923..3aee747 100644
--- a/generateds_gui_notes.txt
+++ b/generateds_gui_notes.txt
@@ -12,7 +12,7 @@ GenerateDS GUI Notes
.. version
-:revision: 2.29.23
+:revision: 2.29.24
.. version
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index c0c1d36..b838fab 100644
--- a/gui/generateds_gui.py
+++ b/gui/generateds_gui.py
@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.29.23'
+VERSION = '2.29.24'
##VERSION##
diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html
index 7049ae9..6425741 100644
--- a/librarytemplate_howto.html
+++ b/librarytemplate_howto.html
@@ -217,7 +217,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.23</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.24</td>
</tr>
</tbody>
</table>
@@ -226,7 +226,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">August 16, 2018</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 27, 2018</td>
</tr>
</tbody>
</table>
@@ -380,7 +380,7 @@ this command for your needs. For example, you may need to use
<div class="footer">
<hr class="footer" />
<a class="reference external" href="librarytemplate_howto.txt">View document source</a>.
-Generated on: 2018-08-16 22:29 UTC.
+Generated on: 2018-08-27 21:50 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt
index 971c8fd..0edddd2 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
-:revision: 2.29.23
+:revision: 2.29.24
.. version
diff --git a/process_includes.py b/process_includes.py
index f083e63..23df4f2 100755
--- a/process_includes.py
+++ b/process_includes.py
@@ -40,7 +40,7 @@ except ImportError:
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.29.23'
+VERSION = '2.29.24'
##VERSION##
CatalogDict = {}
diff --git a/setup.py b/setup.py
index 834c8f3..167bf5d 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ setup(
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
- version="2.29.23",
+ version="2.29.24",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index 4f2b00c..302c340 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -763,7 +763,7 @@ class oneperType00_1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType00_1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType00_1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType00_1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -774,27 +774,27 @@ class oneperType00_1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType00_1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType00_1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType00_1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType00_1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType00_1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType00_1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType00_1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType00_1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.inner01 is not None:
- self.inner01.export(outfile, level, namespace_, name_='inner01', pretty_print=pretty_print)
+ self.inner01.export(outfile, level, namespaceprefix_, name_='inner01', pretty_print=pretty_print)
if self.inner02 is not None:
- self.inner02.export(outfile, level, namespace_, name_='inner02', pretty_print=pretty_print)
+ self.inner02.export(outfile, level, namespaceprefix_, name_='inner02', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index 88d1791..eb0889b 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -763,7 +763,7 @@ class oneperType01_1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType01_1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType01_1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType01_1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -774,19 +774,19 @@ class oneperType01_1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType01_1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType01_1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType01_1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType01_1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType01_1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType01_1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType01_1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType01_1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -795,7 +795,7 @@ class oneperType01_1(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<username>%s</username>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.username), input_name='username')), eol_))
if self.inner01 is not None:
- self.inner01.export(outfile, level, namespace_, name_='inner01', pretty_print=pretty_print)
+ self.inner01.export(outfile, level, namespaceprefix_, name_='inner01', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -847,7 +847,7 @@ class oneperType01_2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType01_2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType01_2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType01_2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -858,19 +858,19 @@ class oneperType01_2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType01_2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType01_2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType01_2', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType01_2', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType01_2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType01_2'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType01_2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType01_2', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index 7eb4aef..0533a39 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -763,7 +763,7 @@ class oneperType02_1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType02_1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType02_1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType02_1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -774,19 +774,19 @@ class oneperType02_1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType02_1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType02_1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType02_1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType02_1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType02_1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType02_1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType02_1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType02_1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -795,7 +795,7 @@ class oneperType02_1(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<clientname>%s</clientname>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.clientname), input_name='clientname')), eol_))
if self.inner01 is not None:
- self.inner01.export(outfile, level, namespace_, name_='inner01', pretty_print=pretty_print)
+ self.inner01.export(outfile, level, namespaceprefix_, name_='inner01', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -847,7 +847,7 @@ class oneperType02_2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType02_2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType02_2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType02_2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -858,19 +858,19 @@ class oneperType02_2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType02_2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType02_2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType02_2', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType02_2', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType02_2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType02_2'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType02_2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType02_2', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index dbf59e3..b7a7776 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -763,7 +763,7 @@ class oneperType03_1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType03_1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType03_1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType03_1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -774,19 +774,19 @@ class oneperType03_1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType03_1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType03_1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType03_1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType03_1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType03_1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType03_1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType03_1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType03_1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -795,7 +795,7 @@ class oneperType03_1(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<helpername>%s</helpername>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.helpername), input_name='helpername')), eol_))
if self.inner01 is not None:
- self.inner01.export(outfile, level, namespace_, name_='inner01', pretty_print=pretty_print)
+ self.inner01.export(outfile, level, namespaceprefix_, name_='inner01', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -847,7 +847,7 @@ class oneperType03_2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='oneperType03_2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='oneperType03_2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('oneperType03_2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -858,19 +858,19 @@ class oneperType03_2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='oneperType03_2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='oneperType03_2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='oneperType03_2', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='oneperType03_2', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='oneperType03_2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='oneperType03_2'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='oneperType03_2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='oneperType03_2', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index b6b7b47..47335e1 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -763,7 +763,7 @@ class carrierType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='target:', name_='carrierType', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='target:', name_='carrierType', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('carrierType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -774,25 +774,25 @@ class carrierType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='carrierType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='carrierType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='target:', name_='carrierType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='target:', name_='carrierType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='target:', name_='carrierType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='target:', name_='carrierType'):
pass
- def exportChildren(self, outfile, level, namespace_='target:', name_='carrierType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='target:', name_='carrierType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for fleet_ in self.fleet:
- fleet_.export(outfile, level, namespace_, pretty_print=pretty_print)
+ fleet_.export(outfile, level, namespaceprefix_, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -853,7 +853,7 @@ class Vehicle(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='target:', name_='Vehicle', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='target:', name_='Vehicle', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Vehicle')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -864,22 +864,22 @@ class Vehicle(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Vehicle')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Vehicle')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='target:', name_='Vehicle', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='target:', name_='Vehicle', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='target:', name_='Vehicle'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='target:', name_='Vehicle'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='target:', name_='Vehicle', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='target:', name_='Vehicle', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -924,7 +924,7 @@ class Car(Vehicle):
return True
else:
return False
- def export(self, outfile, level, namespace_='target:', name_='Car', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='target:', name_='Car', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Car')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -935,19 +935,19 @@ class Car(Vehicle):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Car')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Car')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='target:', name_='Car', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='target:', name_='Car', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='target:', name_='Car'):
- super(Car, self).exportAttributes(outfile, level, already_processed, namespace_, name_='Car')
- def exportChildren(self, outfile, level, namespace_='target:', name_='Car', fromsubclass_=False, pretty_print=True):
- super(Car, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='target:', name_='Car'):
+ super(Car, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Car')
+ def exportChildren(self, outfile, level, namespaceprefix_='target:', name_='Car', fromsubclass_=False, pretty_print=True):
+ super(Car, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
pass
def build(self, node):
already_processed = set()
@@ -990,7 +990,7 @@ class Plane(Vehicle):
return True
else:
return False
- def export(self, outfile, level, namespace_='target:', name_='Plane', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='target:', name_='Plane', namespacedef_='xmlns:target="http://cars.example.com/schema"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Plane')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1001,19 +1001,19 @@ class Plane(Vehicle):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Plane')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Plane')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='target:', name_='Plane', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='target:', name_='Plane', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='target:', name_='Plane'):
- super(Plane, self).exportAttributes(outfile, level, already_processed, namespace_, name_='Plane')
- def exportChildren(self, outfile, level, namespace_='target:', name_='Plane', fromsubclass_=False, pretty_print=True):
- super(Plane, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='target:', name_='Plane'):
+ super(Plane, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Plane')
+ def exportChildren(self, outfile, level, namespaceprefix_='target:', name_='Plane', fromsubclass_=False, pretty_print=True):
+ super(Plane, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
pass
def build(self, node):
already_processed = set()
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index 0d81841..658ca2f 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -765,7 +765,7 @@ class document1Type(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='document1Type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='document1Type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('document1Type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -776,19 +776,19 @@ class document1Type(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='document1Type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='document1Type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='document1Type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='document1Type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='document1Type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='document1Type'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='document1Type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='document1Type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -797,7 +797,7 @@ class document1Type(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<comments>%s</comments>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.comments), input_name='comments')), eol_))
if self.otherdoc is not None:
- self.otherdoc.export(outfile, level, namespace_, name_='otherdoc', pretty_print=pretty_print)
+ self.otherdoc.export(outfile, level, namespaceprefix_, name_='otherdoc', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -862,7 +862,7 @@ class document2Type(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='document2Type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='document2Type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('document2Type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -873,19 +873,19 @@ class document2Type(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='document2Type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='document2Type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='document2Type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='document2Type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='document2Type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='document2Type'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='document2Type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='document2Type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -897,7 +897,7 @@ class document2Type(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<rating>%s</rating>%s' % (self.gds_format_integer(self.rating, input_name='rating'), eol_))
if self.anotherdoc is not None:
- self.anotherdoc.export(outfile, level, namespace_, name_='anotherdoc', pretty_print=pretty_print)
+ self.anotherdoc.export(outfile, level, namespaceprefix_, name_='anotherdoc', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -963,7 +963,7 @@ class document3Type(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='document3Type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='document3Type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('document3Type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -974,19 +974,19 @@ class document3Type(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='document3Type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='document3Type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='document3Type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='document3Type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='document3Type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='document3Type'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='document3Type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='document3Type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index 79335bf..cbd741a 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -767,7 +767,7 @@ class FooList(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='FooList', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='FooList', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('FooList')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -778,29 +778,29 @@ class FooList(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='FooList')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='FooList')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='FooList', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='FooList', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='FooList'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='FooList'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='FooList', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='FooList', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.Foo is not None:
- self.Foo.export(outfile, level, namespace_, name_='Foo', pretty_print=pretty_print)
+ self.Foo.export(outfile, level, namespaceprefix_, name_='Foo', pretty_print=pretty_print)
if self.Bar is not None:
- self.Bar.export(outfile, level, namespace_, name_='Bar', pretty_print=pretty_print)
+ self.Bar.export(outfile, level, namespaceprefix_, name_='Bar', pretty_print=pretty_print)
if self.Baz is not None:
- self.Baz.export(outfile, level, namespace_, name_='Baz', pretty_print=pretty_print)
+ self.Baz.export(outfile, level, namespaceprefix_, name_='Baz', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -866,7 +866,7 @@ class FooType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='FooType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='FooType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('FooType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -877,19 +877,19 @@ class FooType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='FooType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='FooType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='FooType1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='FooType1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='FooType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='FooType1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='FooType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='FooType1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -953,7 +953,7 @@ class BarType2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='BarType2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='BarType2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('BarType2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -964,19 +964,19 @@ class BarType2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='BarType2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BarType2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='BarType2', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='BarType2', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='BarType2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='BarType2'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='BarType2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='BarType2', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1040,7 +1040,7 @@ class BazType3(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='BazType3', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='BazType3', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('BazType3')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1051,19 +1051,19 @@ class BazType3(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='BazType3')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BazType3')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='BazType3', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='BazType3', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='BazType3'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='BazType3'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='BazType3', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='BazType3', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index 2e1ec8e..d1196d6 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -761,7 +761,7 @@ class test1element(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='test1element', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='test1element', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('test1element')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -772,27 +772,27 @@ class test1element(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='test1element')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='test1element')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='test1element', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='test1element', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='test1element'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='test1element'):
if self.test1attribute is not None and 'test1attribute' not in already_processed:
already_processed.add('test1attribute')
outfile.write(' test1attribute=%s' % (quote_attrib(self.test1attribute), ))
- def exportChildren(self, outfile, level, namespace_='', name_='test1element', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='test1element', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.test1member is not None:
- self.test1member.export(outfile, level, namespace_, name_='test1member', pretty_print=pretty_print)
+ self.test1member.export(outfile, level, namespaceprefix_, name_='test1member', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -846,7 +846,7 @@ class cimAnySimpleType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='cimAnySimpleType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='cimAnySimpleType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('cimAnySimpleType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -857,17 +857,17 @@ class cimAnySimpleType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='cimAnySimpleType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='cimAnySimpleType')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='cimAnySimpleType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='cimAnySimpleType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='cimAnySimpleType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='cimAnySimpleType'):
unique_counter = 0
for name, value in self.anyAttributes_.items():
xsinamespaceprefix = 'xsi'
@@ -900,7 +900,7 @@ class cimAnySimpleType(GeneratedsSuper):
outfile.write(' %s=%s' % (
name, quote_attrib(value), ))
pass
- def exportChildren(self, outfile, level, namespace_='', name_='cimAnySimpleType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='cimAnySimpleType', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 1965ae0..7c8236a 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -767,7 +767,7 @@ class PlantType_single(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='PlantType_single', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='PlantType_single', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PlantType_single')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -778,19 +778,19 @@ class PlantType_single(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PlantType_single')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PlantType_single')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='PlantType_single', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='PlantType_single', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='PlantType_single'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='PlantType_single'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='PlantType_single', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='PlantType_single', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -799,9 +799,9 @@ class PlantType_single(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<name>%s</name>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.name), input_name='name')), eol_))
if self.description is not None:
- self.description.export(outfile, level, namespace_, name_='description', pretty_print=pretty_print)
+ self.description.export(outfile, level, namespaceprefix_, name_='description', pretty_print=pretty_print)
if self.anytypeobjs_ is not None:
- self.anytypeobjs_.export(outfile, level, namespace_, pretty_print=pretty_print)
+ self.anytypeobjs_.export(outfile, level, namespaceprefix_, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -872,7 +872,7 @@ class PlantType_multiple(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='PlantType_multiple', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='PlantType_multiple', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PlantType_multiple')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -883,19 +883,19 @@ class PlantType_multiple(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PlantType_multiple')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PlantType_multiple')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='PlantType_multiple', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='PlantType_multiple', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='PlantType_multiple'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='PlantType_multiple'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='PlantType_multiple', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='PlantType_multiple', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -904,9 +904,9 @@ class PlantType_multiple(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<name>%s</name>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.name), input_name='name')), eol_))
if self.description is not None:
- self.description.export(outfile, level, namespace_, name_='description', pretty_print=pretty_print)
+ self.description.export(outfile, level, namespaceprefix_, name_='description', pretty_print=pretty_print)
for obj_ in self.anytypeobjs_:
- obj_.export(outfile, level, namespace_, pretty_print=pretty_print)
+ obj_.export(outfile, level, namespaceprefix_, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -968,7 +968,7 @@ class DescriptionType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DescriptionType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DescriptionType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DescriptionType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -979,19 +979,19 @@ class DescriptionType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DescriptionType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DescriptionType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DescriptionType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DescriptionType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DescriptionType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DescriptionType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DescriptionType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DescriptionType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1058,7 +1058,7 @@ class CatalogType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='CatalogType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='CatalogType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('CatalogType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1069,19 +1069,19 @@ class CatalogType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='CatalogType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='CatalogType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='CatalogType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='CatalogType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='CatalogType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='CatalogType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='CatalogType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='CatalogType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1146,7 +1146,7 @@ class PlantType_single_nochild(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='PlantType_single_nochild', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='PlantType_single_nochild', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PlantType_single_nochild')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1157,25 +1157,25 @@ class PlantType_single_nochild(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PlantType_single_nochild')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PlantType_single_nochild')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='PlantType_single_nochild', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='PlantType_single_nochild', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='PlantType_single_nochild'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='PlantType_single_nochild'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='PlantType_single_nochild', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='PlantType_single_nochild', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.anytypeobjs_ is not None:
- self.anytypeobjs_.export(outfile, level, namespace_, pretty_print=pretty_print)
+ self.anytypeobjs_.export(outfile, level, namespaceprefix_, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1226,7 +1226,7 @@ class PlantType_multiple_nochild(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='PlantType_multiple_nochild', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='PlantType_multiple_nochild', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PlantType_multiple_nochild')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1237,25 +1237,25 @@ class PlantType_multiple_nochild(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PlantType_multiple_nochild')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PlantType_multiple_nochild')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='PlantType_multiple_nochild', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='PlantType_multiple_nochild', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='PlantType_multiple_nochild'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='PlantType_multiple_nochild'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='PlantType_multiple_nochild', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='PlantType_multiple_nochild', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for obj_ in self.anytypeobjs_:
- obj_.export(outfile, level, namespace_, pretty_print=pretty_print)
+ obj_.export(outfile, level, namespaceprefix_, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index fe40940..1cbe23a 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -793,7 +793,7 @@ class GetUserReq(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='GetUserReq', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='GetUserReq', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('GetUserReq')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -804,17 +804,17 @@ class GetUserReq(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='GetUserReq')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='GetUserReq')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='GetUserReq', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='GetUserReq', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='GetUserReq'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='GetUserReq'):
if self.sequence is not None and 'sequence' not in already_processed:
already_processed.add('sequence')
outfile.write(' sequence="%s"' % self.gds_format_integer(self.sequence, input_name='sequence'))
@@ -842,7 +842,7 @@ class GetUserReq(GeneratedsSuper):
if self.value08 is not None and 'value08' not in already_processed:
already_processed.add('value08')
outfile.write(' value08=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.value08), input_name='value08')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='GetUserReq', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='GetUserReq', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/cdata1_sup.py b/tests/cdata1_sup.py
index 8df3046..5e122ff 100644
--- a/tests/cdata1_sup.py
+++ b/tests/cdata1_sup.py
@@ -764,7 +764,7 @@ class cdataListType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='cdataListType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='cdataListType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('cdataListType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -775,25 +775,25 @@ class cdataListType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='cdataListType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='cdataListType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='cdataListType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='cdataListType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='cdataListType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='cdataListType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='cdataListType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='cdataListType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for cdatalist_ in self.cdatalist:
- cdatalist_.export(outfile, level, namespace_, name_='cdatalist', pretty_print=pretty_print)
+ cdatalist_.export(outfile, level, namespaceprefix_, name_='cdatalist', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -841,7 +841,7 @@ class cdataType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='cdataType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='cdataType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('cdataType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -852,19 +852,19 @@ class cdataType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='cdataType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='cdataType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='cdataType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='cdataType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='cdataType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='cdataType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='cdataType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='cdataType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/cleanupname1_sup.py b/tests/cleanupname1_sup.py
index 16bac1b..47ae245 100644
--- a/tests/cleanupname1_sup.py
+++ b/tests/cleanupname1_sup.py
@@ -778,7 +778,7 @@ class dataKind(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='dataType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='dataType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('dataType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -789,33 +789,33 @@ class dataKind(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='dataType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='dataType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='dataType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='dataType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='dataType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='dataType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='dataType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='dataType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.data1 is not None:
- self.data1.export(outfile, level, namespace_, name_='data1', pretty_print=pretty_print)
+ self.data1.export(outfile, level, namespaceprefix_, name_='data1', pretty_print=pretty_print)
if self.data2 is not None:
- self.data2.export(outfile, level, namespace_, name_='data2', pretty_print=pretty_print)
+ self.data2.export(outfile, level, namespaceprefix_, name_='data2', pretty_print=pretty_print)
if self.data3 is not None:
- self.data3.export(outfile, level, namespace_, name_='data3', pretty_print=pretty_print)
+ self.data3.export(outfile, level, namespaceprefix_, name_='data3', pretty_print=pretty_print)
if self.data4 is not None:
- self.data4.export(outfile, level, namespace_, name_='data4', pretty_print=pretty_print)
+ self.data4.export(outfile, level, namespaceprefix_, name_='data4', pretty_print=pretty_print)
if self.data5 is not None:
- self.data5.export(outfile, level, namespace_, name_='data5', pretty_print=pretty_print)
+ self.data5.export(outfile, level, namespaceprefix_, name_='data5', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -883,7 +883,7 @@ class data1Kind(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='data1Type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='data1Type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('data1Type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -894,19 +894,19 @@ class data1Kind(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='data1Type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='data1Type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='data1Type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='data1Type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='data1Type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='data1Type'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='data1Type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='data1Type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -960,7 +960,7 @@ class MlassData2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='TypeData2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='TypeData2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('TypeData2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -971,19 +971,19 @@ class MlassData2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='TypeData2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='TypeData2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='TypeData2', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='TypeData2', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='TypeData2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='TypeData2'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='TypeData2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='TypeData2', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1037,7 +1037,7 @@ class RealTypeData3(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='RealTypeData3', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='RealTypeData3', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('RealTypeData3')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1048,19 +1048,19 @@ class RealTypeData3(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='RealTypeData3')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='RealTypeData3')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='RealTypeData3', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='RealTypeData3', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='RealTypeData3'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='RealTypeData3'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='RealTypeData3', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='RealTypeData3', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1114,7 +1114,7 @@ class MMMMMMdataKind(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='AABBCCdataType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='AABBCCdataType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('AABBCCdataType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1125,19 +1125,19 @@ class MMMMMMdataKind(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='AABBCCdataType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='AABBCCdataType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='AABBCCdataType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='AABBCCdataType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='AABBCCdataType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='AABBCCdataType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='AABBCCdataType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='AABBCCdataType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1191,7 +1191,7 @@ class dataTypeNNNMNNN(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='dataTypeXYZAXYZ', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='dataTypeXYZAXYZ', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('dataTypeXYZAXYZ')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1202,19 +1202,19 @@ class dataTypeNNNMNNN(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='dataTypeXYZAXYZ')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='dataTypeXYZAXYZ')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='dataTypeXYZAXYZ', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='dataTypeXYZAXYZ', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='dataTypeXYZAXYZ'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='dataTypeXYZAXYZ'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='dataTypeXYZAXYZ', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='dataTypeXYZAXYZ', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/defaults_cases1_sup.py b/tests/defaults_cases1_sup.py
index 4538332..3dd0935 100644
--- a/tests/defaults_cases1_sup.py
+++ b/tests/defaults_cases1_sup.py
@@ -795,7 +795,7 @@ class DefaultTypes(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultTypes')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -806,31 +806,31 @@ class DefaultTypes(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultTypes')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultTypes')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultTypes', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultTypes', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultTypes'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultTypes'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for default1_ in self.default1:
- default1_.export(outfile, level, namespace_, name_='default1', pretty_print=pretty_print)
+ default1_.export(outfile, level, namespaceprefix_, name_='default1', pretty_print=pretty_print)
for default2_ in self.default2:
- default2_.export(outfile, level, namespace_, name_='default2', pretty_print=pretty_print)
+ default2_.export(outfile, level, namespaceprefix_, name_='default2', pretty_print=pretty_print)
for fixed1_ in self.fixed1:
- fixed1_.export(outfile, level, namespace_, name_='fixed1', pretty_print=pretty_print)
+ fixed1_.export(outfile, level, namespaceprefix_, name_='fixed1', pretty_print=pretty_print)
for fixed2_ in self.fixed2:
- fixed2_.export(outfile, level, namespace_, name_='fixed2', pretty_print=pretty_print)
+ fixed2_.export(outfile, level, namespaceprefix_, name_='fixed2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -928,7 +928,7 @@ class DefaultType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -939,19 +939,19 @@ class DefaultType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1090,7 +1090,7 @@ class DefaultType2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1101,16 +1101,16 @@ class DefaultType2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType2', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType2', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType2'):
if self.attrdefault01 != "abcd" and 'attrdefault01' not in already_processed:
already_processed.add('attrdefault01')
outfile.write(' attrdefault01=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrdefault01), input_name='attrdefault01')), ))
@@ -1123,7 +1123,7 @@ class DefaultType2(GeneratedsSuper):
if self.attrnormal02 is not None and 'attrnormal02' not in already_processed:
already_processed.add('attrnormal02')
outfile.write(' attrnormal02="%s"' % self.gds_format_integer(self.attrnormal02, input_name='attrnormal02'))
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1224,7 +1224,7 @@ class FixedType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='FixedType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='FixedType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('FixedType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1235,19 +1235,19 @@ class FixedType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='FixedType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='FixedType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='FixedType1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='FixedType1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='FixedType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='FixedType1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='FixedType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='FixedType1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1386,7 +1386,7 @@ class FixedType2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='FixedType2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='FixedType2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('FixedType2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1397,16 +1397,16 @@ class FixedType2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='FixedType2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='FixedType2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='FixedType2', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='FixedType2', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='FixedType2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='FixedType2'):
if self.attrfixed01 != "abcd" and 'attrfixed01' not in already_processed:
already_processed.add('attrfixed01')
outfile.write(' attrfixed01=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrfixed01), input_name='attrfixed01')), ))
@@ -1419,7 +1419,7 @@ class FixedType2(GeneratedsSuper):
if self.attrnormal02 is not None and 'attrnormal02' not in already_processed:
already_processed.add('attrnormal02')
outfile.write(' attrnormal02="%s"' % self.gds_format_integer(self.attrnormal02, input_name='attrnormal02'))
- def exportChildren(self, outfile, level, namespace_='', name_='FixedType2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='FixedType2', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/defaults_cases_always1_sup.py b/tests/defaults_cases_always1_sup.py
index fc155a5..336bd86 100644
--- a/tests/defaults_cases_always1_sup.py
+++ b/tests/defaults_cases_always1_sup.py
@@ -774,7 +774,7 @@ class DefaultTypes(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultTypes')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -785,27 +785,27 @@ class DefaultTypes(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultTypes')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultTypes')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultTypes', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultTypes', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultTypes'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultTypes'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for default1_ in self.default1:
- default1_.export(outfile, level, namespace_, name_='default1', pretty_print=pretty_print)
+ default1_.export(outfile, level, namespaceprefix_, name_='default1', pretty_print=pretty_print)
for default2_ in self.default2:
- default2_.export(outfile, level, namespace_, name_='default2', pretty_print=pretty_print)
+ default2_.export(outfile, level, namespaceprefix_, name_='default2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -893,7 +893,7 @@ class DefaultType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -904,19 +904,19 @@ class DefaultType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1055,7 +1055,7 @@ class DefaultType2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1066,16 +1066,16 @@ class DefaultType2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType2', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType2', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType2'):
if self.attrdefault01 is not None and 'attrdefault01' not in already_processed:
already_processed.add('attrdefault01')
outfile.write(' attrdefault01=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrdefault01), input_name='attrdefault01')), ))
@@ -1088,7 +1088,7 @@ class DefaultType2(GeneratedsSuper):
if self.attrnormal02 is not None and 'attrnormal02' not in already_processed:
already_processed.add('attrnormal02')
outfile.write(' attrnormal02="%s"' % self.gds_format_integer(self.attrnormal02, input_name='attrnormal02'))
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/defaults_cases_always2_sup.py b/tests/defaults_cases_always2_sup.py
index fc155a5..336bd86 100644
--- a/tests/defaults_cases_always2_sup.py
+++ b/tests/defaults_cases_always2_sup.py
@@ -774,7 +774,7 @@ class DefaultTypes(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultTypes')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -785,27 +785,27 @@ class DefaultTypes(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultTypes')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultTypes')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultTypes', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultTypes', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultTypes'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultTypes'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for default1_ in self.default1:
- default1_.export(outfile, level, namespace_, name_='default1', pretty_print=pretty_print)
+ default1_.export(outfile, level, namespaceprefix_, name_='default1', pretty_print=pretty_print)
for default2_ in self.default2:
- default2_.export(outfile, level, namespace_, name_='default2', pretty_print=pretty_print)
+ default2_.export(outfile, level, namespaceprefix_, name_='default2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -893,7 +893,7 @@ class DefaultType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -904,19 +904,19 @@ class DefaultType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1055,7 +1055,7 @@ class DefaultType2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1066,16 +1066,16 @@ class DefaultType2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType2', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType2', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType2'):
if self.attrdefault01 is not None and 'attrdefault01' not in already_processed:
already_processed.add('attrdefault01')
outfile.write(' attrdefault01=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrdefault01), input_name='attrdefault01')), ))
@@ -1088,7 +1088,7 @@ class DefaultType2(GeneratedsSuper):
if self.attrnormal02 is not None and 'attrnormal02' not in already_processed:
already_processed.add('attrnormal02')
outfile.write(' attrnormal02="%s"' % self.gds_format_integer(self.attrnormal02, input_name='attrnormal02'))
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/defaults_coverage1_sup.py b/tests/defaults_coverage1_sup.py
index 318cf4a..57b3741 100644
--- a/tests/defaults_coverage1_sup.py
+++ b/tests/defaults_coverage1_sup.py
@@ -762,7 +762,7 @@ class DefaultTypes(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultTypes')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -773,27 +773,27 @@ class DefaultTypes(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultTypes')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultTypes')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultTypes', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultTypes', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultTypes'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultTypes'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultTypes', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.default1 is not None:
- self.default1.export(outfile, level, namespace_, name_='default1', pretty_print=pretty_print)
+ self.default1.export(outfile, level, namespaceprefix_, name_='default1', pretty_print=pretty_print)
if self.default2 is not None:
- self.default2.export(outfile, level, namespace_, name_='default2', pretty_print=pretty_print)
+ self.default2.export(outfile, level, namespaceprefix_, name_='default2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -950,7 +950,7 @@ class DefaultType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -961,19 +961,19 @@ class DefaultType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType1', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType1', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType1'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType1', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1285,7 +1285,7 @@ class DefaultType2(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DefaultType2', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DefaultType2')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1296,19 +1296,19 @@ class DefaultType2(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DefaultType2')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DefaultType2')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DefaultType2', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DefaultType2', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DefaultType2'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DefaultType2'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DefaultType2', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index 46d4e74..c26096a 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -776,7 +776,7 @@ class SpecialDate(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='SpecialDate', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='SpecialDate', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('SpecialDate')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -787,21 +787,21 @@ class SpecialDate(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='SpecialDate')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='SpecialDate')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='SpecialDate', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='SpecialDate', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='SpecialDate'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='SpecialDate'):
if self.SpecialProperty is not None and 'SpecialProperty' not in already_processed:
already_processed.add('SpecialProperty')
outfile.write(' SpecialProperty=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.SpecialProperty), input_name='SpecialProperty')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='SpecialDate', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='SpecialDate', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -854,7 +854,7 @@ class ExtremeDate(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='ExtremeDate', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='ExtremeDate', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('ExtremeDate')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -865,21 +865,21 @@ class ExtremeDate(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='ExtremeDate')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='ExtremeDate')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='ExtremeDate', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='ExtremeDate', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='ExtremeDate'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='ExtremeDate'):
if self.ExtremeProperty is not None and 'ExtremeProperty' not in already_processed:
already_processed.add('ExtremeProperty')
outfile.write(' ExtremeProperty=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.ExtremeProperty), input_name='ExtremeProperty')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='ExtremeDate', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='ExtremeDate', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -932,7 +932,7 @@ class singleExtremeDate(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='singleExtremeDate', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='singleExtremeDate', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('singleExtremeDate')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -943,21 +943,21 @@ class singleExtremeDate(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='singleExtremeDate')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='singleExtremeDate')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='singleExtremeDate', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='singleExtremeDate', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='singleExtremeDate'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='singleExtremeDate'):
if self.ExtremeProperty is not None and 'ExtremeProperty' not in already_processed:
already_processed.add('ExtremeProperty')
outfile.write(' ExtremeProperty=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.ExtremeProperty), input_name='ExtremeProperty')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='singleExtremeDate', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='singleExtremeDate', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1017,7 +1017,7 @@ class containerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='containerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='containerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('containerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1028,27 +1028,27 @@ class containerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='containerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='containerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='containerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='containerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='containerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='containerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='containerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='containerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for simplefactoid_ in self.simplefactoid:
- simplefactoid_.export(outfile, level, namespace_, name_='simplefactoid', pretty_print=pretty_print)
+ simplefactoid_.export(outfile, level, namespaceprefix_, name_='simplefactoid', pretty_print=pretty_print)
if self.mixedfactoid is not None:
- self.mixedfactoid.export(outfile, level, namespace_, name_='mixedfactoid', pretty_print=pretty_print)
+ self.mixedfactoid.export(outfile, level, namespaceprefix_, name_='mixedfactoid', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1132,7 +1132,7 @@ class simpleFactoidType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleFactoidType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleFactoidType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleFactoidType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1143,19 +1143,19 @@ class simpleFactoidType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleFactoidType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleFactoidType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleFactoidType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleFactoidType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleFactoidType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleFactoidType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleFactoidType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleFactoidType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1256,7 +1256,7 @@ class mixedFactoidType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='mixedFactoidType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='mixedFactoidType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('mixedFactoidType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1267,22 +1267,22 @@ class mixedFactoidType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='mixedFactoidType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='mixedFactoidType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='mixedFactoidType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='mixedFactoidType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='mixedFactoidType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='mixedFactoidType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='mixedFactoidType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='mixedFactoidType', fromsubclass_=False, pretty_print=True):
if not fromsubclass_:
for item_ in self.content_:
- item_.export(outfile, level, item_.name, namespace_, pretty_print=pretty_print)
+ item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1357,7 +1357,7 @@ class BaseType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='BaseType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='BaseType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('BaseType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1368,17 +1368,17 @@ class BaseType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='BaseType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BaseType')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='BaseType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='BaseType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='BaseType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='BaseType'):
if self.BaseProperty1 is not None and 'BaseProperty1' not in already_processed:
already_processed.add('BaseProperty1')
outfile.write(' BaseProperty1=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.BaseProperty1), input_name='BaseProperty1')), ))
@@ -1389,7 +1389,7 @@ class BaseType(GeneratedsSuper):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='BaseType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='BaseType', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1456,7 +1456,7 @@ class DerivedType(BaseType):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='DerivedType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='DerivedType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('DerivedType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1467,26 +1467,26 @@ class DerivedType(BaseType):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='DerivedType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DerivedType')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='DerivedType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='DerivedType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='DerivedType'):
- super(DerivedType, self).exportAttributes(outfile, level, already_processed, namespace_, name_='DerivedType')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DerivedType'):
+ super(DerivedType, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DerivedType')
if self.DerivedProperty1 is not None and 'DerivedProperty1' not in already_processed:
already_processed.add('DerivedProperty1')
outfile.write(' DerivedProperty1=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.DerivedProperty1), input_name='DerivedProperty1')), ))
if self.DerivedProperty2 is not None and 'DerivedProperty2' not in already_processed:
already_processed.add('DerivedProperty2')
outfile.write(' DerivedProperty2=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.DerivedProperty2), input_name='DerivedProperty2')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='DerivedType', fromsubclass_=False, pretty_print=True):
- super(DerivedType, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='DerivedType', fromsubclass_=False, pretty_print=True):
+ super(DerivedType, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
pass
def build(self, node):
already_processed = set()
@@ -1544,7 +1544,7 @@ class MyInteger(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='MyInteger', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='MyInteger', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('MyInteger')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1555,21 +1555,21 @@ class MyInteger(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='MyInteger')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='MyInteger')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='MyInteger', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='MyInteger', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='MyInteger'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='MyInteger'):
if self.MyAttr is not None and 'MyAttr' not in already_processed:
already_processed.add('MyAttr')
outfile.write(' MyAttr=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.MyAttr), input_name='MyAttr')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='MyInteger', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='MyInteger', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1622,7 +1622,7 @@ class MyBoolean(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='MyBoolean', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='MyBoolean', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('MyBoolean')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1633,21 +1633,21 @@ class MyBoolean(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='MyBoolean')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='MyBoolean')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='MyBoolean', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='MyBoolean', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='MyBoolean'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='MyBoolean'):
if self.MyAttr is not None and 'MyAttr' not in already_processed:
already_processed.add('MyAttr')
outfile.write(' MyAttr=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.MyAttr), input_name='MyAttr')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='MyBoolean', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='MyBoolean', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1700,7 +1700,7 @@ class MyFloat(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='MyFloat', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='MyFloat', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('MyFloat')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1711,21 +1711,21 @@ class MyFloat(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='MyFloat')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='MyFloat')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='MyFloat', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='MyFloat', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='MyFloat'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='MyFloat'):
if self.MyAttr is not None and 'MyAttr' not in already_processed:
already_processed.add('MyAttr')
outfile.write(' MyAttr=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.MyAttr), input_name='MyAttr')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='MyFloat', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='MyFloat', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1778,7 +1778,7 @@ class MyDouble(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='MyDouble', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='MyDouble', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('MyDouble')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1789,21 +1789,21 @@ class MyDouble(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='MyDouble')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='MyDouble')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='MyDouble', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='MyDouble', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='MyDouble'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='MyDouble'):
if self.MyAttr is not None and 'MyAttr' not in already_processed:
already_processed.add('MyAttr')
outfile.write(' MyAttr=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.MyAttr), input_name='MyAttr')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='MyDouble', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='MyDouble', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/ipo1_sup.py b/tests/ipo1_sup.py
index 9f64f69..2fca052 100644
--- a/tests/ipo1_sup.py
+++ b/tests/ipo1_sup.py
@@ -786,7 +786,7 @@ class PurchaseOrderType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='PurchaseOrderType', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='PurchaseOrderType', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PurchaseOrderType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -797,34 +797,34 @@ class PurchaseOrderType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PurchaseOrderType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PurchaseOrderType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='PurchaseOrderType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='PurchaseOrderType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='PurchaseOrderType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='PurchaseOrderType'):
if self.orderDate is not None and 'orderDate' not in already_processed:
already_processed.add('orderDate')
outfile.write(' orderDate="%s"' % self.gds_format_date(self.orderDate, input_name='orderDate'))
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='PurchaseOrderType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='PurchaseOrderType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.shipTo is not None:
- self.shipTo.export(outfile, level, namespace_, name_='shipTo', pretty_print=pretty_print)
+ self.shipTo.export(outfile, level, namespaceprefix_, name_='shipTo', pretty_print=pretty_print)
if self.billTo is not None:
- self.billTo.export(outfile, level, namespace_, name_='billTo', pretty_print=pretty_print)
+ self.billTo.export(outfile, level, namespaceprefix_, name_='billTo', pretty_print=pretty_print)
if self.comment is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<ipo:comment>%s</ipo:comment>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.comment), input_name='comment')), eol_))
if self.items is not None:
- self.items.export(outfile, level, namespace_, name_='items', pretty_print=pretty_print)
+ self.items.export(outfile, level, namespaceprefix_, name_='items', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -900,7 +900,7 @@ class Items(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='Items', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='Items', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Items')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -911,25 +911,25 @@ class Items(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Items')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Items')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='Items', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='Items', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='Items'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='Items'):
pass
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='Items', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='Items', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for item_ in self.item:
- item_.export(outfile, level, namespace_, name_='item', pretty_print=pretty_print)
+ item_.export(outfile, level, namespaceprefix_, name_='item', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1005,7 +1005,7 @@ class item(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='item', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='item', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('item')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1016,21 +1016,21 @@ class item(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='item')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='item')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='item', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='item', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='item'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='item'):
if self.partNum is not None and 'partNum' not in already_processed:
already_processed.add('partNum')
outfile.write(' partNum=%s' % (quote_attrib(self.partNum), ))
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='item', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='item', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1122,7 +1122,7 @@ class quantity(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='quantity', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='quantity', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('quantity')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1133,18 +1133,18 @@ class quantity(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='quantity')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='quantity')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='quantity', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='quantity', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='quantity'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='quantity'):
pass
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='quantity', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='quantity', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1202,7 +1202,7 @@ class Address(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='Address', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='Address', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Address')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1213,23 +1213,23 @@ class Address(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Address')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Address')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='Address', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='Address', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='Address'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='Address'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='Address', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='Address', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1320,7 +1320,7 @@ class USAddress(Address):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='USAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='USAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('USAddress')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1331,20 +1331,20 @@ class USAddress(Address):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='USAddress')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='USAddress')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='USAddress', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='USAddress', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='USAddress'):
- super(USAddress, self).exportAttributes(outfile, level, already_processed, namespace_, name_='USAddress')
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='USAddress', fromsubclass_=False, pretty_print=True):
- super(USAddress, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='USAddress'):
+ super(USAddress, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='USAddress')
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='USAddress', fromsubclass_=False, pretty_print=True):
+ super(USAddress, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1420,7 +1420,7 @@ class UKAddress(Address):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='UKAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='UKAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('UKAddress')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1431,23 +1431,23 @@ class UKAddress(Address):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='UKAddress')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='UKAddress')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='UKAddress', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='UKAddress', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='UKAddress'):
- super(UKAddress, self).exportAttributes(outfile, level, already_processed, namespace_, name_='UKAddress')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='UKAddress'):
+ super(UKAddress, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='UKAddress')
if self.exportCode != 1 and 'exportCode' not in already_processed:
already_processed.add('exportCode')
outfile.write(' exportCode="%s"' % self.gds_format_integer(self.exportCode, input_name='exportCode'))
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='UKAddress', fromsubclass_=False, pretty_print=True):
- super(UKAddress, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='UKAddress', fromsubclass_=False, pretty_print=True):
+ super(UKAddress, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/ipo2_sup.py b/tests/ipo2_sup.py
index 9f64f69..2fca052 100644
--- a/tests/ipo2_sup.py
+++ b/tests/ipo2_sup.py
@@ -786,7 +786,7 @@ class PurchaseOrderType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='PurchaseOrderType', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='PurchaseOrderType', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PurchaseOrderType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -797,34 +797,34 @@ class PurchaseOrderType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PurchaseOrderType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PurchaseOrderType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='PurchaseOrderType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='PurchaseOrderType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='PurchaseOrderType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='PurchaseOrderType'):
if self.orderDate is not None and 'orderDate' not in already_processed:
already_processed.add('orderDate')
outfile.write(' orderDate="%s"' % self.gds_format_date(self.orderDate, input_name='orderDate'))
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='PurchaseOrderType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='PurchaseOrderType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.shipTo is not None:
- self.shipTo.export(outfile, level, namespace_, name_='shipTo', pretty_print=pretty_print)
+ self.shipTo.export(outfile, level, namespaceprefix_, name_='shipTo', pretty_print=pretty_print)
if self.billTo is not None:
- self.billTo.export(outfile, level, namespace_, name_='billTo', pretty_print=pretty_print)
+ self.billTo.export(outfile, level, namespaceprefix_, name_='billTo', pretty_print=pretty_print)
if self.comment is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<ipo:comment>%s</ipo:comment>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.comment), input_name='comment')), eol_))
if self.items is not None:
- self.items.export(outfile, level, namespace_, name_='items', pretty_print=pretty_print)
+ self.items.export(outfile, level, namespaceprefix_, name_='items', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -900,7 +900,7 @@ class Items(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='Items', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='Items', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Items')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -911,25 +911,25 @@ class Items(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Items')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Items')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='Items', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='Items', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='Items'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='Items'):
pass
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='Items', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='Items', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for item_ in self.item:
- item_.export(outfile, level, namespace_, name_='item', pretty_print=pretty_print)
+ item_.export(outfile, level, namespaceprefix_, name_='item', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1005,7 +1005,7 @@ class item(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='item', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='item', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('item')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1016,21 +1016,21 @@ class item(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='item')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='item')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='item', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='item', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='item'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='item'):
if self.partNum is not None and 'partNum' not in already_processed:
already_processed.add('partNum')
outfile.write(' partNum=%s' % (quote_attrib(self.partNum), ))
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='item', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='item', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1122,7 +1122,7 @@ class quantity(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='quantity', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='quantity', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('quantity')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1133,18 +1133,18 @@ class quantity(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='quantity')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='quantity')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='quantity', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='quantity', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='quantity'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='quantity'):
pass
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='quantity', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='quantity', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1202,7 +1202,7 @@ class Address(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='Address', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='Address', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('Address')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1213,23 +1213,23 @@ class Address(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='Address')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Address')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='Address', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='Address', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='Address'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='Address'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='Address', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='Address', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1320,7 +1320,7 @@ class USAddress(Address):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='USAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='USAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('USAddress')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1331,20 +1331,20 @@ class USAddress(Address):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='USAddress')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='USAddress')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='USAddress', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='USAddress', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='USAddress'):
- super(USAddress, self).exportAttributes(outfile, level, already_processed, namespace_, name_='USAddress')
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='USAddress', fromsubclass_=False, pretty_print=True):
- super(USAddress, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='USAddress'):
+ super(USAddress, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='USAddress')
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='USAddress', fromsubclass_=False, pretty_print=True):
+ super(USAddress, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1420,7 +1420,7 @@ class UKAddress(Address):
return True
else:
return False
- def export(self, outfile, level, namespace_='ipo:', name_='UKAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='ipo:', name_='UKAddress', namespacedef_='xmlns:ipo="http://www.example.com/IPO"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('UKAddress')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1431,23 +1431,23 @@ class UKAddress(Address):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='UKAddress')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='UKAddress')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='ipo:', name_='UKAddress', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='ipo:', name_='UKAddress', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='ipo:', name_='UKAddress'):
- super(UKAddress, self).exportAttributes(outfile, level, already_processed, namespace_, name_='UKAddress')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='ipo:', name_='UKAddress'):
+ super(UKAddress, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='UKAddress')
if self.exportCode != 1 and 'exportCode' not in already_processed:
already_processed.add('exportCode')
outfile.write(' exportCode="%s"' % self.gds_format_integer(self.exportCode, input_name='exportCode'))
- def exportChildren(self, outfile, level, namespace_='ipo:', name_='UKAddress', fromsubclass_=False, pretty_print=True):
- super(UKAddress, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='ipo:', name_='UKAddress', fromsubclass_=False, pretty_print=True):
+ super(UKAddress, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py
index 0dfcead..6cc5905 100644
--- a/tests/mapcleanname1_sup.py
+++ b/tests/mapcleanname1_sup.py
@@ -778,7 +778,7 @@ class complex_type01(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='complex-type01', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='complex-type01', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex-type01')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -789,19 +789,19 @@ class complex_type01(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type01')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type01')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='complex-type01', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='complex-type01', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='complex-type01'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex-type01'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='complex-type01', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='complex-type01', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -816,7 +816,7 @@ class complex_type01(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<float_value01>%s</float_value01>%s' % (self.gds_format_float(self.float_value01, input_name='float_value01'), eol_))
if self.field01 is not None:
- self.field01.export(outfile, level, namespace_, name_='field01', pretty_print=pretty_print)
+ self.field01.export(outfile, level, namespaceprefix_, name_='field01', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -903,7 +903,7 @@ class complex_type02(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='complex-type02', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='complex-type02', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex-type02')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -914,23 +914,23 @@ class complex_type02(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type02')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type02')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='complex-type02', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='complex-type02', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='complex-type02'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex-type02'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='', name_='complex-type02', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='complex-type02', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1027,7 +1027,7 @@ class complex_type03(complex_type02):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='complex-type03', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='complex-type03', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex-type03')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1038,20 +1038,20 @@ class complex_type03(complex_type02):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type03')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type03')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='complex-type03', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='complex-type03', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='complex-type03'):
- super(complex_type03, self).exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type03')
- def exportChildren(self, outfile, level, namespace_='', name_='complex-type03', fromsubclass_=False, pretty_print=True):
- super(complex_type03, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex-type03'):
+ super(complex_type03, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type03')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='complex-type03', fromsubclass_=False, pretty_print=True):
+ super(complex_type03, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1147,7 +1147,7 @@ class type_(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1158,23 +1158,23 @@ class type_(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='type'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='', name_='type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1271,7 +1271,7 @@ class complex_type04(type_):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='complex-type04', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='complex-type04', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex-type04')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1282,20 +1282,20 @@ class complex_type04(type_):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type04')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type04')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='complex-type04', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='complex-type04', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='complex-type04'):
- super(complex_type04, self).exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type04')
- def exportChildren(self, outfile, level, namespace_='', name_='complex-type04', fromsubclass_=False, pretty_print=True):
- super(complex_type04, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex-type04'):
+ super(complex_type04, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type04')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='complex-type04', fromsubclass_=False, pretty_print=True):
+ super(complex_type04, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1391,7 +1391,7 @@ class build_(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='build', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='build', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('build')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1402,23 +1402,23 @@ class build_(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='build')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='build')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='build', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='build', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='build'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='build'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='', name_='build', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='build', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1515,7 +1515,7 @@ class complex_type05(build_):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='complex-type05', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='complex-type05', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex-type05')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1526,20 +1526,20 @@ class complex_type05(build_):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type05')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type05')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='complex-type05', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='complex-type05', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='complex-type05'):
- super(complex_type05, self).exportAttributes(outfile, level, already_processed, namespace_, name_='complex-type05')
- def exportChildren(self, outfile, level, namespace_='', name_='complex-type05', fromsubclass_=False, pretty_print=True):
- super(complex_type05, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex-type05'):
+ super(complex_type05, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex-type05')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='complex-type05', fromsubclass_=False, pretty_print=True):
+ super(complex_type05, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/mixedcontent1_sup.py b/tests/mixedcontent1_sup.py
index 218fff3..50da494 100644
--- a/tests/mixedcontent1_sup.py
+++ b/tests/mixedcontent1_sup.py
@@ -762,7 +762,7 @@ class rootType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='rootType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='rootType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('rootType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -773,25 +773,25 @@ class rootType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='rootType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='rootType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='rootType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='rootType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='rootType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='rootType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='rootType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='rootType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for markup_ in self.markup:
- markup_.export(outfile, level, namespace_, name_='markup', pretty_print=pretty_print)
+ markup_.export(outfile, level, namespaceprefix_, name_='markup', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -870,7 +870,7 @@ class markupType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='markupType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='markupType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('markupType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -881,22 +881,22 @@ class markupType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='markupType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='markupType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='markupType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='markupType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='markupType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='markupType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='markupType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='markupType', fromsubclass_=False, pretty_print=True):
if not fromsubclass_:
for item_ in self.content_:
- item_.export(outfile, level, item_.name, namespace_, pretty_print=pretty_print)
+ item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -905,7 +905,7 @@ class markupType(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<embedded>%s</embedded>%s' % (self.gds_encode(self.gds_format_string(quote_xml(embedded_), input_name='embedded')), eol_))
for nested_ in self.nested:
- nested_.export(outfile, level, namespace_, name_='nested', pretty_print=pretty_print)
+ nested_.export(outfile, level, namespaceprefix_, name_='nested', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1000,7 +1000,7 @@ class nestedType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='nestedType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='nestedType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('nestedType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1011,25 +1011,25 @@ class nestedType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='nestedType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='nestedType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='nestedType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='nestedType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='nestedType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='nestedType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='nestedType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='nestedType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for nested1_ in self.nested1:
- nested1_.export(outfile, level, namespace_, name_='nested1', pretty_print=pretty_print)
+ nested1_.export(outfile, level, namespaceprefix_, name_='nested1', pretty_print=pretty_print)
for nested2_ in self.nested2:
showIndent(outfile, level, pretty_print)
outfile.write('<nested2>%s</nested2>%s' % (self.gds_encode(self.gds_format_string(quote_xml(nested2_), input_name='nested2')), eol_))
@@ -1112,7 +1112,7 @@ class nested1Type(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='nested1Type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='nested1Type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('nested1Type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1123,27 +1123,27 @@ class nested1Type(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='nested1Type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='nested1Type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='nested1Type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='nested1Type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='nested1Type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='nested1Type'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='nested1Type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='nested1Type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for nestedA1_ in self.nestedA1:
- nestedA1_.export(outfile, level, namespace_, name_='nestedA1', pretty_print=pretty_print)
+ nestedA1_.export(outfile, level, namespaceprefix_, name_='nestedA1', pretty_print=pretty_print)
for nestedA2_ in self.nestedA2:
- nestedA2_.export(outfile, level, namespace_, name_='nestedA2', pretty_print=pretty_print)
+ nestedA2_.export(outfile, level, namespaceprefix_, name_='nestedA2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1213,7 +1213,7 @@ class nested1AType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='nested1AType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='nested1AType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('nested1AType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1224,19 +1224,19 @@ class nested1AType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='nested1AType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='nested1AType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='nested1AType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='nested1AType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='nested1AType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='nested1AType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='nested1AType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='nested1AType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/mixedcontent2_sup.py b/tests/mixedcontent2_sup.py
index 218fff3..50da494 100644
--- a/tests/mixedcontent2_sup.py
+++ b/tests/mixedcontent2_sup.py
@@ -762,7 +762,7 @@ class rootType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='rootType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='rootType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('rootType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -773,25 +773,25 @@ class rootType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='rootType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='rootType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='rootType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='rootType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='rootType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='rootType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='rootType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='rootType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for markup_ in self.markup:
- markup_.export(outfile, level, namespace_, name_='markup', pretty_print=pretty_print)
+ markup_.export(outfile, level, namespaceprefix_, name_='markup', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -870,7 +870,7 @@ class markupType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='markupType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='markupType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('markupType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -881,22 +881,22 @@ class markupType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='markupType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='markupType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='markupType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='markupType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='markupType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='markupType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='markupType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='markupType', fromsubclass_=False, pretty_print=True):
if not fromsubclass_:
for item_ in self.content_:
- item_.export(outfile, level, item_.name, namespace_, pretty_print=pretty_print)
+ item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -905,7 +905,7 @@ class markupType(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<embedded>%s</embedded>%s' % (self.gds_encode(self.gds_format_string(quote_xml(embedded_), input_name='embedded')), eol_))
for nested_ in self.nested:
- nested_.export(outfile, level, namespace_, name_='nested', pretty_print=pretty_print)
+ nested_.export(outfile, level, namespaceprefix_, name_='nested', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1000,7 +1000,7 @@ class nestedType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='nestedType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='nestedType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('nestedType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1011,25 +1011,25 @@ class nestedType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='nestedType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='nestedType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='nestedType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='nestedType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='nestedType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='nestedType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='nestedType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='nestedType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for nested1_ in self.nested1:
- nested1_.export(outfile, level, namespace_, name_='nested1', pretty_print=pretty_print)
+ nested1_.export(outfile, level, namespaceprefix_, name_='nested1', pretty_print=pretty_print)
for nested2_ in self.nested2:
showIndent(outfile, level, pretty_print)
outfile.write('<nested2>%s</nested2>%s' % (self.gds_encode(self.gds_format_string(quote_xml(nested2_), input_name='nested2')), eol_))
@@ -1112,7 +1112,7 @@ class nested1Type(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='nested1Type', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='nested1Type', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('nested1Type')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1123,27 +1123,27 @@ class nested1Type(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='nested1Type')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='nested1Type')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='nested1Type', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='nested1Type', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='nested1Type'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='nested1Type'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='nested1Type', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='nested1Type', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for nestedA1_ in self.nestedA1:
- nestedA1_.export(outfile, level, namespace_, name_='nestedA1', pretty_print=pretty_print)
+ nestedA1_.export(outfile, level, namespaceprefix_, name_='nestedA1', pretty_print=pretty_print)
for nestedA2_ in self.nestedA2:
- nestedA2_.export(outfile, level, namespace_, name_='nestedA2', pretty_print=pretty_print)
+ nestedA2_.export(outfile, level, namespaceprefix_, name_='nestedA2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1213,7 +1213,7 @@ class nested1AType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='nested1AType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='nested1AType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('nested1AType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1224,19 +1224,19 @@ class nested1AType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='nested1AType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='nested1AType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='nested1AType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='nested1AType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='nested1AType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='nested1AType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='nested1AType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='nested1AType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/nested_def1_sup.py b/tests/nested_def1_sup.py
index af0b3d9..5db145f 100644
--- a/tests/nested_def1_sup.py
+++ b/tests/nested_def1_sup.py
@@ -761,7 +761,7 @@ class containerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='containerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='containerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('containerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -772,27 +772,27 @@ class containerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='containerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='containerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='containerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='containerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='containerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='containerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='containerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='containerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.item1 is not None:
- self.item1.export(outfile, level, namespace_, name_='item1', pretty_print=pretty_print)
+ self.item1.export(outfile, level, namespaceprefix_, name_='item1', pretty_print=pretty_print)
if self.item2 is not None:
- self.item2.export(outfile, level, namespace_, name_='item2', pretty_print=pretty_print)
+ self.item2.export(outfile, level, namespaceprefix_, name_='item2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -845,7 +845,7 @@ class classAType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='classAType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='classAType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('classAType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -856,25 +856,25 @@ class classAType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='classAType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='classAType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='classAType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='classAType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='classAType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='classAType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='classAType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='classAType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.inner is not None:
- self.inner.export(outfile, level, namespace_, name_='inner', pretty_print=pretty_print)
+ self.inner.export(outfile, level, namespaceprefix_, name_='inner', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -922,7 +922,7 @@ class classBType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='classBType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='classBType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('classBType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -933,25 +933,25 @@ class classBType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='classBType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='classBType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='classBType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='classBType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='classBType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='classBType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='classBType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='classBType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.inner is not None:
- self.inner.export(outfile, level, namespace_, name_='inner', pretty_print=pretty_print)
+ self.inner.export(outfile, level, namespaceprefix_, name_='inner', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1003,7 +1003,7 @@ class innerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='innerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='innerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('innerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1014,23 +1014,23 @@ class innerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='innerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='innerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='innerType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='innerType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='innerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='innerType'):
if self.attrA1 is not None and 'attrA1' not in already_processed:
already_processed.add('attrA1')
outfile.write(' attrA1=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrA1), input_name='attrA1')), ))
if self.attrA2 is not None and 'attrA2' not in already_processed:
already_processed.add('attrA2')
outfile.write(' attrA2=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrA2), input_name='attrA2')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='innerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='innerType', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1086,7 +1086,7 @@ class innerType1(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='innerType1', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='innerType1', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('innerType1')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1097,23 +1097,23 @@ class innerType1(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='innerType1')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='innerType1')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='innerType1', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='innerType1', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='innerType1'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='innerType1'):
if self.attrB1 is not None and 'attrB1' not in already_processed:
already_processed.add('attrB1')
outfile.write(' attrB1=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrB1), input_name='attrB1')), ))
if self.attrB2 is not None and 'attrB2' not in already_processed:
already_processed.add('attrB2')
outfile.write(' attrB2=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.attrB2), input_name='attrB2')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='innerType1', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='innerType1', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index 12f1c21..0068b57 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -814,7 +814,7 @@ class people(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='people', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='people', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('people')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -825,33 +825,33 @@ class people(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='people')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='people')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='people', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='people', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='people'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='people'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='people', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='people', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for comments_ in self.comments:
- comments_.export(outfile, level, namespace_, name_='comments', pretty_print=pretty_print)
+ comments_.export(outfile, level, namespaceprefix_, name_='comments', pretty_print=pretty_print)
for person_ in self.person:
- person_.export(outfile, level, namespace_, name_='person', pretty_print=pretty_print)
+ person_.export(outfile, level, namespaceprefix_, name_='person', pretty_print=pretty_print)
for programmer_ in self.programmer:
- programmer_.export(outfile, level, namespace_, name_='programmer', pretty_print=pretty_print)
+ programmer_.export(outfile, level, namespaceprefix_, name_='programmer', pretty_print=pretty_print)
for python_programmer_ in self.python_programmer:
- python_programmer_.export(outfile, level, namespace_, name_='python-programmer', pretty_print=pretty_print)
+ python_programmer_.export(outfile, level, namespaceprefix_, name_='python-programmer', pretty_print=pretty_print)
for java_programmer_ in self.java_programmer:
- java_programmer_.export(outfile, level, namespace_, name_='java-programmer', pretty_print=pretty_print)
+ java_programmer_.export(outfile, level, namespaceprefix_, name_='java-programmer', pretty_print=pretty_print)
def exportLiteral(self, outfile, level, name_='people'):
level += 1
already_processed = set()
@@ -1061,7 +1061,7 @@ class comments(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='comments', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='comments', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('comments')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1072,22 +1072,22 @@ class comments(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='comments')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='comments')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='comments', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='comments', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='comments'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='comments'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='comments', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='comments', fromsubclass_=False, pretty_print=True):
if not fromsubclass_:
for item_ in self.content_:
- item_.export(outfile, level, item_.name, namespace_, pretty_print=pretty_print)
+ item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1281,7 +1281,7 @@ class person(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='person', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='person', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('person')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1292,17 +1292,17 @@ class person(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='person')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='person')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='person', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='person', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='person'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='person'):
if self.value is not None and 'value' not in already_processed:
already_processed.add('value')
outfile.write(' value=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.value), input_name='value')), ))
@@ -1322,7 +1322,7 @@ class person(GeneratedsSuper):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='person', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='person', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1337,9 +1337,9 @@ class person(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<category>%s</category>%s' % (self.gds_format_integer(self.category, input_name='category'), eol_))
for agent_ in self.agent:
- agent_.export(outfile, level, namespace_, name_='agent', pretty_print=pretty_print)
+ agent_.export(outfile, level, namespaceprefix_, name_='agent', pretty_print=pretty_print)
for promoter_ in self.promoter:
- promoter_.export(outfile, level, namespace_, name_='promoter', pretty_print=pretty_print)
+ promoter_.export(outfile, level, namespaceprefix_, name_='promoter', pretty_print=pretty_print)
if self.description is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<description>%s</description>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.description), input_name='description')), eol_))
@@ -1665,7 +1665,7 @@ class programmer(person):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1676,18 +1676,18 @@ class programmer(person):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='programmer'):
- super(programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='programmer'):
+ super(programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='programmer')
if self.language is not None and 'language' not in already_processed:
already_processed.add('language')
outfile.write(' language=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.language), input_name='language')), ))
@@ -1710,8 +1710,8 @@ class programmer(person):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='programmer', fromsubclass_=False, pretty_print=True):
- super(programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='programmer', fromsubclass_=False, pretty_print=True):
+ super(programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1747,7 +1747,7 @@ class programmer(person):
showIndent(outfile, level, pretty_print)
outfile.write('<ellong>%s</ellong>%s' % (self.gds_format_integer(self.ellong, input_name='ellong'), eol_))
if self.elparam is not None:
- self.elparam.export(outfile, level, namespace_, name_='elparam', pretty_print=pretty_print)
+ self.elparam.export(outfile, level, namespaceprefix_, name_='elparam', pretty_print=pretty_print)
if self.elarraytypes is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<elarraytypes>%s</elarraytypes>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.elarraytypes), input_name='elarraytypes')), eol_))
@@ -2074,7 +2074,7 @@ class param(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='param', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='param', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('param')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2085,17 +2085,17 @@ class param(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='param')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='param')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='param', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='param', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='param'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='param'):
if self.id is not None and 'id' not in already_processed:
already_processed.add('id')
outfile.write(' id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.id), input_name='id')), ))
@@ -2114,7 +2114,7 @@ class param(GeneratedsSuper):
if self.type_ is not None and 'type_' not in already_processed:
already_processed.add('type_')
outfile.write(' type=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.type_), input_name='type')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='param', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='param', fromsubclass_=False, pretty_print=True):
pass
def exportLiteral(self, outfile, level, name_='param'):
level += 1
@@ -2271,7 +2271,7 @@ class python_programmer(programmer):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='python-programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='python-programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('python-programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2282,23 +2282,23 @@ class python_programmer(programmer):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='python-programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='python-programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='python-programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='python-programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='python-programmer'):
- super(python_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='python-programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='python-programmer'):
+ super(python_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='python-programmer')
if self.nick_name is not None and 'nick_name' not in already_processed:
already_processed.add('nick_name')
outfile.write(' nick-name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.nick_name), input_name='nick-name')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='python-programmer', fromsubclass_=False, pretty_print=True):
- super(python_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='python-programmer', fromsubclass_=False, pretty_print=True):
+ super(python_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -2430,7 +2430,7 @@ class java_programmer(programmer):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='java-programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='java-programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('java-programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2441,26 +2441,26 @@ class java_programmer(programmer):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='java-programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='java-programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='java-programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='java-programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='java-programmer'):
- super(java_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='java-programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='java-programmer'):
+ super(java_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='java-programmer')
if self.nick_name is not None and 'nick_name' not in already_processed:
already_processed.add('nick_name')
outfile.write(' nick-name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.nick_name), input_name='nick-name')), ))
if self.status is not None and 'status' not in already_processed:
already_processed.add('status')
outfile.write(' status=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.status), input_name='status')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='java-programmer', fromsubclass_=False, pretty_print=True):
- super(java_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='java-programmer', fromsubclass_=False, pretty_print=True):
+ super(java_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -2605,7 +2605,7 @@ class agent(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='agent', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='agent', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('agent')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2616,19 +2616,19 @@ class agent(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='agent')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='agent')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='agent', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='agent', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='agent'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='agent'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='agent', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='agent', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2643,7 +2643,7 @@ class agent(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<priority>%s</priority>%s' % (self.gds_format_float(self.priority, input_name='priority'), eol_))
if self.info is not None:
- self.info.export(outfile, level, namespace_, name_='info', pretty_print=pretty_print)
+ self.info.export(outfile, level, namespaceprefix_, name_='info', pretty_print=pretty_print)
def exportLiteral(self, outfile, level, name_='agent'):
level += 1
already_processed = set()
@@ -2792,7 +2792,7 @@ class special_agent(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='special-agent', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='special-agent', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('special-agent')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2803,19 +2803,19 @@ class special_agent(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='special-agent')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='special-agent')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='special-agent', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='special-agent', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='special-agent'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='special-agent'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='special-agent', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='special-agent', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2830,7 +2830,7 @@ class special_agent(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<priority>%s</priority>%s' % (self.gds_format_float(self.priority, input_name='priority'), eol_))
if self.info is not None:
- self.info.export(outfile, level, namespace_, name_='info', pretty_print=pretty_print)
+ self.info.export(outfile, level, namespaceprefix_, name_='info', pretty_print=pretty_print)
def exportLiteral(self, outfile, level, name_='special-agent'):
level += 1
already_processed = set()
@@ -3012,7 +3012,7 @@ class booster(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='booster', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='booster', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('booster')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -3023,19 +3023,19 @@ class booster(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='booster')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='booster')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='booster', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='booster', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='booster'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='booster'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='booster', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='booster', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -3059,7 +3059,7 @@ class booster(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<type>%s</type>%s' % (self.gds_format_float(type_, input_name='type'), eol_))
for client_handler_ in self.client_handler:
- client_handler_.export(outfile, level, namespace_, name_='client-handler', pretty_print=pretty_print)
+ client_handler_.export(outfile, level, namespaceprefix_, name_='client-handler', pretty_print=pretty_print)
def exportLiteral(self, outfile, level, name_='booster'):
level += 1
already_processed = set()
@@ -3252,7 +3252,7 @@ class info(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='info', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='info', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('info')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -3263,16 +3263,16 @@ class info(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='info')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='info')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='info', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='info', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='info'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='info'):
if self.name is not None and 'name' not in already_processed:
already_processed.add('name')
outfile.write(' name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.name), input_name='name')), ))
@@ -3282,7 +3282,7 @@ class info(GeneratedsSuper):
if self.rating is not None and 'rating' not in already_processed:
already_processed.add('rating')
outfile.write(' rating="%s"' % self.gds_format_float(self.rating, input_name='rating'))
- def exportChildren(self, outfile, level, namespace_='', name_='info', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='info', fromsubclass_=False, pretty_print=True):
pass
def exportLiteral(self, outfile, level, name_='info'):
level += 1
@@ -3416,7 +3416,7 @@ class client_handlerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='client-handlerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='client-handlerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('client-handlerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -3427,19 +3427,19 @@ class client_handlerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='client-handlerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='client-handlerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='client-handlerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='client-handlerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='client-handlerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='client-handlerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='client-handlerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='client-handlerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index 2264fa3..55b08cc 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -826,7 +826,7 @@ class people(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='people', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='people', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('people')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -837,35 +837,35 @@ class people(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='people')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='people')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='people', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='people', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='people'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='people'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='people', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='people', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for comments_ in self.comments:
- comments_.export(outfile, level, namespace_, name_='comments', pretty_print=pretty_print)
+ comments_.export(outfile, level, namespaceprefix_, name_='comments', pretty_print=pretty_print)
for person_ in self.person:
- person_.export(outfile, level, namespace_, name_='person', pretty_print=pretty_print)
+ person_.export(outfile, level, namespaceprefix_, name_='person', pretty_print=pretty_print)
for specialperson_ in self.specialperson:
- specialperson_.export(outfile, level, namespace_, name_='specialperson', pretty_print=pretty_print)
+ specialperson_.export(outfile, level, namespaceprefix_, name_='specialperson', pretty_print=pretty_print)
for programmer_ in self.programmer:
- programmer_.export(outfile, level, namespace_, name_='programmer', pretty_print=pretty_print)
+ programmer_.export(outfile, level, namespaceprefix_, name_='programmer', pretty_print=pretty_print)
for python_programmer_ in self.python_programmer:
- python_programmer_.export(outfile, level, namespace_, name_='python-programmer', pretty_print=pretty_print)
+ python_programmer_.export(outfile, level, namespaceprefix_, name_='python-programmer', pretty_print=pretty_print)
for java_programmer_ in self.java_programmer:
- java_programmer_.export(outfile, level, namespace_, name_='java-programmer', pretty_print=pretty_print)
+ java_programmer_.export(outfile, level, namespaceprefix_, name_='java-programmer', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -971,7 +971,7 @@ class comments(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='comments', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='comments', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('comments')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -982,22 +982,22 @@ class comments(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='comments')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='comments')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='comments', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='comments', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='comments'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='comments'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='comments', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='comments', fromsubclass_=False, pretty_print=True):
if not fromsubclass_:
for item_ in self.content_:
- item_.export(outfile, level, item_.name, namespace_, pretty_print=pretty_print)
+ item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1138,7 +1138,7 @@ class person(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='person', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='person', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('person')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1149,17 +1149,17 @@ class person(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='person')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='person')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='person', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='person', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='person'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='person'):
if self.value is not None and 'value' not in already_processed:
already_processed.add('value')
outfile.write(' value=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.value), input_name='value')), ))
@@ -1179,7 +1179,7 @@ class person(GeneratedsSuper):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='person', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='person', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1194,9 +1194,9 @@ class person(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<category>%s</category>%s' % (self.gds_format_integer(self.category, input_name='category'), eol_))
for agent_ in self.agent:
- agent_.export(outfile, level, namespace_, name_='agent', pretty_print=pretty_print)
+ agent_.export(outfile, level, namespaceprefix_, name_='agent', pretty_print=pretty_print)
for promoter_ in self.promoter:
- promoter_.export(outfile, level, namespace_, name_='promoter', pretty_print=pretty_print)
+ promoter_.export(outfile, level, namespaceprefix_, name_='promoter', pretty_print=pretty_print)
if self.description is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<description>%s</description>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.description), input_name='description')), eol_))
@@ -1298,7 +1298,7 @@ class specialperson(person):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='specialperson', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='specialperson', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('specialperson')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1309,20 +1309,20 @@ class specialperson(person):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='specialperson')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='specialperson')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='specialperson', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='specialperson', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='specialperson'):
- super(specialperson, self).exportAttributes(outfile, level, already_processed, namespace_, name_='specialperson')
- def exportChildren(self, outfile, level, namespace_='', name_='specialperson', fromsubclass_=False, pretty_print=True):
- super(specialperson, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='specialperson'):
+ super(specialperson, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='specialperson')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='specialperson', fromsubclass_=False, pretty_print=True):
+ super(specialperson, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1393,7 +1393,7 @@ class param(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='param', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='param', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('param')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1404,17 +1404,17 @@ class param(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='param')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='param')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='param', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='param', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='param'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='param'):
if self.id is not None and 'id' not in already_processed:
already_processed.add('id')
outfile.write(' id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.id), input_name='id')), ))
@@ -1433,7 +1433,7 @@ class param(GeneratedsSuper):
if self.type_ is not None and 'type_' not in already_processed:
already_processed.add('type_')
outfile.write(' type=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.type_), input_name='type')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='param', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='param', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1529,7 +1529,7 @@ class agent(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='agent', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='agent', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('agent')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1540,19 +1540,19 @@ class agent(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='agent')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='agent')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='agent', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='agent', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='agent'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='agent'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='agent', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='agent', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1567,9 +1567,9 @@ class agent(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<priority>%s</priority>%s' % (self.gds_format_float(self.priority, input_name='priority'), eol_))
if self.info is not None:
- self.info.export(outfile, level, namespace_, name_='info', pretty_print=pretty_print)
+ self.info.export(outfile, level, namespaceprefix_, name_='info', pretty_print=pretty_print)
for vehicle_ in self.vehicle:
- vehicle_.export(outfile, level, namespace_, pretty_print=pretty_print)
+ vehicle_.export(outfile, level, namespaceprefix_, pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1669,7 +1669,7 @@ class special_agent(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='special-agent', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='special-agent', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('special-agent')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1680,19 +1680,19 @@ class special_agent(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='special-agent')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='special-agent')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='special-agent', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='special-agent', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='special-agent'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='special-agent'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='special-agent', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='special-agent', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1707,7 +1707,7 @@ class special_agent(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<priority>%s</priority>%s' % (self.gds_format_float(self.priority, input_name='priority'), eol_))
if self.info is not None:
- self.info.export(outfile, level, namespace_, name_='info', pretty_print=pretty_print)
+ self.info.export(outfile, level, namespaceprefix_, name_='info', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1823,7 +1823,7 @@ class booster(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='booster', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='booster', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('booster')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1834,21 +1834,21 @@ class booster(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='booster')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='booster')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='booster', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='booster', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='booster'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='booster'):
if self.member_id is not None and 'member_id' not in already_processed:
already_processed.add('member_id')
outfile.write(' member-id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.member_id), input_name='member-id')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='booster', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='booster', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1872,7 +1872,7 @@ class booster(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<type>%s</type>%s' % (self.gds_format_float(type_, input_name='type'), eol_))
for client_handler_ in self.client_handler:
- client_handler_.export(outfile, level, namespace_, name_='client-handler', pretty_print=pretty_print)
+ client_handler_.export(outfile, level, namespaceprefix_, name_='client-handler', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1971,7 +1971,7 @@ class info(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='info', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='info', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('info')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1982,16 +1982,16 @@ class info(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='info')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='info')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='info', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='info', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='info'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='info'):
if self.name is not None and 'name' not in already_processed:
already_processed.add('name')
outfile.write(' name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.name), input_name='name')), ))
@@ -2001,7 +2001,7 @@ class info(GeneratedsSuper):
if self.rating is not None and 'rating' not in already_processed:
already_processed.add('rating')
outfile.write(' rating="%s"' % self.gds_format_float(self.rating, input_name='rating'))
- def exportChildren(self, outfile, level, namespace_='', name_='info', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='info', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -2066,7 +2066,7 @@ class vehicle(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='vehicle', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='vehicle', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('vehicle')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2077,23 +2077,23 @@ class vehicle(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='vehicle')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='vehicle')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='vehicle', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='vehicle', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='vehicle'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='vehicle'):
if self.extensiontype_ is not None and 'xsi:type' not in already_processed:
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
pass
- def exportChildren(self, outfile, level, namespace_='', name_='vehicle', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='vehicle', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2156,7 +2156,7 @@ class automobile(vehicle):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='automobile', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='automobile', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('automobile')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2167,20 +2167,20 @@ class automobile(vehicle):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='automobile')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='automobile')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='automobile', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='automobile', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='automobile'):
- super(automobile, self).exportAttributes(outfile, level, already_processed, namespace_, name_='automobile')
- def exportChildren(self, outfile, level, namespace_='', name_='automobile', fromsubclass_=False, pretty_print=True):
- super(automobile, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='automobile'):
+ super(automobile, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='automobile')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='automobile', fromsubclass_=False, pretty_print=True):
+ super(automobile, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -2237,7 +2237,7 @@ class airplane(vehicle):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='airplane', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='airplane', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('airplane')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2248,20 +2248,20 @@ class airplane(vehicle):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='airplane')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='airplane')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='airplane', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='airplane', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='airplane'):
- super(airplane, self).exportAttributes(outfile, level, already_processed, namespace_, name_='airplane')
- def exportChildren(self, outfile, level, namespace_='', name_='airplane', fromsubclass_=False, pretty_print=True):
- super(airplane, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='airplane'):
+ super(airplane, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='airplane')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='airplane', fromsubclass_=False, pretty_print=True):
+ super(airplane, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -2414,7 +2414,7 @@ class programmer(person):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2425,18 +2425,18 @@ class programmer(person):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='programmer'):
- super(programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='programmer'):
+ super(programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='programmer')
if self.language is not None and 'language' not in already_processed:
already_processed.add('language')
outfile.write(' language=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.language), input_name='language')), ))
@@ -2459,8 +2459,8 @@ class programmer(person):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='programmer', fromsubclass_=False, pretty_print=True):
- super(programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='programmer', fromsubclass_=False, pretty_print=True):
+ super(programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -2493,7 +2493,7 @@ class programmer(person):
showIndent(outfile, level, pretty_print)
outfile.write('<ellong>%s</ellong>%s' % (self.gds_format_integer(self.ellong, input_name='ellong'), eol_))
if self.elparam is not None:
- self.elparam.export(outfile, level, namespace_, name_='elparam', pretty_print=pretty_print)
+ self.elparam.export(outfile, level, namespaceprefix_, name_='elparam', pretty_print=pretty_print)
if self.elarraytypes is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<elarraytypes>%s</elarraytypes>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.elarraytypes), input_name='elarraytypes')), eol_))
@@ -2676,7 +2676,7 @@ class client_handlerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='client-handlerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='client-handlerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('client-handlerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2687,19 +2687,19 @@ class client_handlerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='client-handlerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='client-handlerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='client-handlerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='client-handlerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='client-handlerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='client-handlerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='client-handlerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='client-handlerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2777,7 +2777,7 @@ class java_programmer(programmer):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='java-programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='java-programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('java-programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2788,26 +2788,26 @@ class java_programmer(programmer):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='java-programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='java-programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='java-programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='java-programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='java-programmer'):
- super(java_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='java-programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='java-programmer'):
+ super(java_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='java-programmer')
if self.nick_name is not None and 'nick_name' not in already_processed:
already_processed.add('nick_name')
outfile.write(' nick-name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.nick_name), input_name='nick-name')), ))
if self.status is not None and 'status' not in already_processed:
already_processed.add('status')
outfile.write(' status=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.status), input_name='status')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='java-programmer', fromsubclass_=False, pretty_print=True):
- super(java_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='java-programmer', fromsubclass_=False, pretty_print=True):
+ super(java_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -2878,7 +2878,7 @@ class python_programmer(programmer):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='python-programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='python-programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('python-programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2889,23 +2889,23 @@ class python_programmer(programmer):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='python-programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='python-programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='python-programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='python-programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='python-programmer'):
- super(python_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='python-programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='python-programmer'):
+ super(python_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='python-programmer')
if self.nick_name is not None and 'nick_name' not in already_processed:
already_processed.add('nick_name')
outfile.write(' nick-name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.nick_name), input_name='nick-name')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='python-programmer', fromsubclass_=False, pretty_print=True):
- super(python_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='python-programmer', fromsubclass_=False, pretty_print=True):
+ super(python_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py
index ccaed97..67187ca 100644
--- a/tests/prefix_classname1_sup.py
+++ b/tests/prefix_classname1_sup.py
@@ -814,7 +814,7 @@ class tomato_people(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='people', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='people', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('people')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -825,33 +825,33 @@ class tomato_people(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='people')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='people')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='people', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='people', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='people'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='people'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='people', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='people', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for comments_ in self.comments:
- comments_.export(outfile, level, namespace_, name_='comments', pretty_print=pretty_print)
+ comments_.export(outfile, level, namespaceprefix_, name_='comments', pretty_print=pretty_print)
for person_ in self.person:
- person_.export(outfile, level, namespace_, name_='person', pretty_print=pretty_print)
+ person_.export(outfile, level, namespaceprefix_, name_='person', pretty_print=pretty_print)
for programmer_ in self.programmer:
- programmer_.export(outfile, level, namespace_, name_='programmer', pretty_print=pretty_print)
+ programmer_.export(outfile, level, namespaceprefix_, name_='programmer', pretty_print=pretty_print)
for python_programmer_ in self.python_programmer:
- python_programmer_.export(outfile, level, namespace_, name_='python-programmer', pretty_print=pretty_print)
+ python_programmer_.export(outfile, level, namespaceprefix_, name_='python-programmer', pretty_print=pretty_print)
for java_programmer_ in self.java_programmer:
- java_programmer_.export(outfile, level, namespace_, name_='java-programmer', pretty_print=pretty_print)
+ java_programmer_.export(outfile, level, namespaceprefix_, name_='java-programmer', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -941,7 +941,7 @@ class tomato_comments(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='comments', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='comments', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('comments')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -952,22 +952,22 @@ class tomato_comments(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='comments')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='comments')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='comments', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='comments', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='comments'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='comments'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='comments', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='comments', fromsubclass_=False, pretty_print=True):
if not fromsubclass_:
for item_ in self.content_:
- item_.export(outfile, level, item_.name, namespace_, pretty_print=pretty_print)
+ item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1097,7 +1097,7 @@ class tomato_person(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='person', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='person', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('person')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1108,17 +1108,17 @@ class tomato_person(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='person')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='person')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='person', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='person', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='person'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='person'):
if self.value is not None and 'value' not in already_processed:
already_processed.add('value')
outfile.write(' value=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.value), input_name='value')), ))
@@ -1138,7 +1138,7 @@ class tomato_person(GeneratedsSuper):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='person', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='person', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1153,9 +1153,9 @@ class tomato_person(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<category>%s</category>%s' % (self.gds_format_integer(self.category, input_name='category'), eol_))
for agent_ in self.agent:
- agent_.export(outfile, level, namespace_, name_='agent', pretty_print=pretty_print)
+ agent_.export(outfile, level, namespaceprefix_, name_='agent', pretty_print=pretty_print)
for promoter_ in self.promoter:
- promoter_.export(outfile, level, namespace_, name_='promoter', pretty_print=pretty_print)
+ promoter_.export(outfile, level, namespaceprefix_, name_='promoter', pretty_print=pretty_print)
if self.description is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<description>%s</description>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.description), input_name='description')), eol_))
@@ -1365,7 +1365,7 @@ class tomato_programmer(tomato_person):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1376,18 +1376,18 @@ class tomato_programmer(tomato_person):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='programmer'):
- super(tomato_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='programmer'):
+ super(tomato_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='programmer')
if self.language is not None and 'language' not in already_processed:
already_processed.add('language')
outfile.write(' language=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.language), input_name='language')), ))
@@ -1410,8 +1410,8 @@ class tomato_programmer(tomato_person):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='programmer', fromsubclass_=False, pretty_print=True):
- super(tomato_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='programmer', fromsubclass_=False, pretty_print=True):
+ super(tomato_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1447,7 +1447,7 @@ class tomato_programmer(tomato_person):
showIndent(outfile, level, pretty_print)
outfile.write('<ellong>%s</ellong>%s' % (self.gds_format_integer(self.ellong, input_name='ellong'), eol_))
if self.elparam is not None:
- self.elparam.export(outfile, level, namespace_, name_='elparam', pretty_print=pretty_print)
+ self.elparam.export(outfile, level, namespaceprefix_, name_='elparam', pretty_print=pretty_print)
if self.elarraytypes is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<elarraytypes>%s</elarraytypes>%s' % (self.gds_encode(self.gds_format_string(quote_xml(self.elarraytypes), input_name='elarraytypes')), eol_))
@@ -1655,7 +1655,7 @@ class tomato_param(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='param', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='param', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('param')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1666,17 +1666,17 @@ class tomato_param(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='param')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='param')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='param', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='param', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='param'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='param'):
if self.id is not None and 'id' not in already_processed:
already_processed.add('id')
outfile.write(' id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.id), input_name='id')), ))
@@ -1695,7 +1695,7 @@ class tomato_param(GeneratedsSuper):
if self.type_ is not None and 'type_' not in already_processed:
already_processed.add('type_')
outfile.write(' type=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.type_), input_name='type')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='param', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='param', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -1771,7 +1771,7 @@ class tomato_python_programmer(tomato_programmer):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='python-programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='python-programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('python-programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1782,23 +1782,23 @@ class tomato_python_programmer(tomato_programmer):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='python-programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='python-programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='python-programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='python-programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='python-programmer'):
- super(tomato_python_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='python-programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='python-programmer'):
+ super(tomato_python_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='python-programmer')
if self.nick_name is not None and 'nick_name' not in already_processed:
already_processed.add('nick_name')
outfile.write(' nick-name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.nick_name), input_name='nick-name')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='python-programmer', fromsubclass_=False, pretty_print=True):
- super(tomato_python_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='python-programmer', fromsubclass_=False, pretty_print=True):
+ super(tomato_python_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1867,7 +1867,7 @@ class tomato_java_programmer(tomato_programmer):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='java-programmer', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='java-programmer', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('java-programmer')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1878,26 +1878,26 @@ class tomato_java_programmer(tomato_programmer):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='java-programmer')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='java-programmer')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='java-programmer', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='java-programmer', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='java-programmer'):
- super(tomato_java_programmer, self).exportAttributes(outfile, level, already_processed, namespace_, name_='java-programmer')
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='java-programmer'):
+ super(tomato_java_programmer, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='java-programmer')
if self.nick_name is not None and 'nick_name' not in already_processed:
already_processed.add('nick_name')
outfile.write(' nick-name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.nick_name), input_name='nick-name')), ))
if self.status is not None and 'status' not in already_processed:
already_processed.add('status')
outfile.write(' status=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.status), input_name='status')), ))
- def exportChildren(self, outfile, level, namespace_='', name_='java-programmer', fromsubclass_=False, pretty_print=True):
- super(tomato_java_programmer, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='java-programmer', fromsubclass_=False, pretty_print=True):
+ super(tomato_java_programmer, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
if pretty_print:
eol_ = '\n'
else:
@@ -1975,7 +1975,7 @@ class tomato_agent(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='agent', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='agent', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('agent')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1986,19 +1986,19 @@ class tomato_agent(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='agent')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='agent')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='agent', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='agent', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='agent'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='agent'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='agent', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='agent', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2013,7 +2013,7 @@ class tomato_agent(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<priority>%s</priority>%s' % (self.gds_format_float(self.priority, input_name='priority'), eol_))
if self.info is not None:
- self.info.export(outfile, level, namespace_, name_='info', pretty_print=pretty_print)
+ self.info.export(outfile, level, namespaceprefix_, name_='info', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -2092,7 +2092,7 @@ class tomato_special_agent(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='special-agent', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='special-agent', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('special-agent')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2103,19 +2103,19 @@ class tomato_special_agent(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='special-agent')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='special-agent')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='special-agent', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='special-agent', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='special-agent'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='special-agent'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='special-agent', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='special-agent', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2130,7 +2130,7 @@ class tomato_special_agent(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<priority>%s</priority>%s' % (self.gds_format_float(self.priority, input_name='priority'), eol_))
if self.info is not None:
- self.info.export(outfile, level, namespace_, name_='info', pretty_print=pretty_print)
+ self.info.export(outfile, level, namespaceprefix_, name_='info', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -2242,7 +2242,7 @@ class tomato_booster(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='booster', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='booster', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('booster')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2253,19 +2253,19 @@ class tomato_booster(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='booster')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='booster')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='booster', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='booster', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='booster'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='booster'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='booster', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='booster', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -2289,7 +2289,7 @@ class tomato_booster(GeneratedsSuper):
showIndent(outfile, level, pretty_print)
outfile.write('<type>%s</type>%s' % (self.gds_format_float(type_, input_name='type'), eol_))
for client_handler_ in self.client_handler:
- client_handler_.export(outfile, level, namespace_, name_='client-handler', pretty_print=pretty_print)
+ client_handler_.export(outfile, level, namespaceprefix_, name_='client-handler', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -2385,7 +2385,7 @@ class tomato_info(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='info', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='info', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('info')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2396,16 +2396,16 @@ class tomato_info(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='info')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='info')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='info', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='info', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='info'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='info'):
if self.name is not None and 'name' not in already_processed:
already_processed.add('name')
outfile.write(' name=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.name), input_name='name')), ))
@@ -2415,7 +2415,7 @@ class tomato_info(GeneratedsSuper):
if self.rating is not None and 'rating' not in already_processed:
already_processed.add('rating')
outfile.write(' rating="%s"' % self.gds_format_float(self.rating, input_name='rating'))
- def exportChildren(self, outfile, level, namespace_='', name_='info', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='info', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -2482,7 +2482,7 @@ class tomato_client_handlerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='client-handlerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='client-handlerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('client-handlerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -2493,19 +2493,19 @@ class tomato_client_handlerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='client-handlerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='client-handlerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='client-handlerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='client-handlerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='client-handlerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='client-handlerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='client-handlerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='client-handlerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index 850c8c3..f30cf0c 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -767,7 +767,7 @@ class PersonType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='PersonType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='PersonType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('PersonType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -778,19 +778,19 @@ class PersonType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='PersonType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='PersonType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='PersonType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='PersonType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='PersonType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='PersonType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='PersonType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='PersonType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/reference_simpletype1_sup.py b/tests/reference_simpletype1_sup.py
index 9b1015f..72b5bd5 100644
--- a/tests/reference_simpletype1_sup.py
+++ b/tests/reference_simpletype1_sup.py
@@ -771,7 +771,7 @@ class dummy(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='dummy', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='dummy', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('dummy')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -782,24 +782,24 @@ class dummy(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='dummy')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='dummy')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='dummy', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='dummy', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='dummy'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='dummy'):
if self.test_ref_attr is not None and 'test_ref_attr' not in already_processed:
already_processed.add('test_ref_attr')
outfile.write(' test_ref_attr="%s"' % self.gds_format_integer(self.test_ref_attr, input_name='test_ref_attr'))
if self.test_normal_attr is not None and 'test_normal_attr' not in already_processed:
already_processed.add('test_normal_attr')
outfile.write(' test_normal_attr="%s"' % self.gds_format_integer(self.test_normal_attr, input_name='test_normal_attr'))
- def exportChildren(self, outfile, level, namespace_='', name_='dummy', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='dummy', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/rem_dup_elems1_sup.py b/tests/rem_dup_elems1_sup.py
index 8945e59..7de66a2 100644
--- a/tests/rem_dup_elems1_sup.py
+++ b/tests/rem_dup_elems1_sup.py
@@ -775,7 +775,7 @@ class authorsType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='authorsType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='authorsType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('authorsType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -786,25 +786,25 @@ class authorsType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='authorsType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='authorsType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='authorsType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='authorsType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='authorsType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='authorsType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='authorsType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='authorsType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for author_ in self.author:
- author_.export(outfile, level, namespace_, name_='author', pretty_print=pretty_print)
+ author_.export(outfile, level, namespaceprefix_, name_='author', pretty_print=pretty_print)
for cooperation_ in self.cooperation:
showIndent(outfile, level, pretty_print)
outfile.write('<cooperation>%s</cooperation>%s' % (self.gds_encode(self.gds_format_string(quote_xml(cooperation_), input_name='cooperation')), eol_))
@@ -859,7 +859,7 @@ class author(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='author', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='author', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('author')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -870,19 +870,19 @@ class author(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='author')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='author')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='author', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='author', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='author'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='author'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='author', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='author', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index 895aa6e..c413af8 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -788,7 +788,7 @@ class IdentifierType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='IdentifierType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='IdentifierType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('IdentifierType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -799,17 +799,17 @@ class IdentifierType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='IdentifierType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='IdentifierType')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='IdentifierType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='IdentifierType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='IdentifierType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='IdentifierType'):
if self.schemeID is not None and 'schemeID' not in already_processed:
already_processed.add('schemeID')
outfile.write(' schemeID=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.schemeID), input_name='schemeID')), ))
@@ -835,7 +835,7 @@ class IdentifierType(GeneratedsSuper):
already_processed.add('xsi:type')
outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
outfile.write(' xsi:type="%s"' % self.extensiontype_)
- def exportChildren(self, outfile, level, namespace_='', name_='IdentifierType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='IdentifierType', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -914,7 +914,7 @@ class BillOfResourcesIDType(IdentifierType):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='BillOfResourcesIDType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='BillOfResourcesIDType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('BillOfResourcesIDType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -925,20 +925,20 @@ class BillOfResourcesIDType(IdentifierType):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='BillOfResourcesIDType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BillOfResourcesIDType')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='BillOfResourcesIDType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='BillOfResourcesIDType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='BillOfResourcesIDType'):
- super(BillOfResourcesIDType, self).exportAttributes(outfile, level, already_processed, namespace_, name_='BillOfResourcesIDType')
- def exportChildren(self, outfile, level, namespace_='', name_='BillOfResourcesIDType', fromsubclass_=False, pretty_print=True):
- super(BillOfResourcesIDType, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='BillOfResourcesIDType'):
+ super(BillOfResourcesIDType, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BillOfResourcesIDType')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='BillOfResourcesIDType', fromsubclass_=False, pretty_print=True):
+ super(BillOfResourcesIDType, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
pass
def build(self, node):
already_processed = set()
@@ -986,7 +986,7 @@ class BillOfMaterialIDType(IdentifierType):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='BillOfMaterialIDType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='BillOfMaterialIDType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('BillOfMaterialIDType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -997,20 +997,20 @@ class BillOfMaterialIDType(IdentifierType):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='BillOfMaterialIDType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BillOfMaterialIDType')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='', name_='BillOfMaterialIDType', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='BillOfMaterialIDType', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='BillOfMaterialIDType'):
- super(BillOfMaterialIDType, self).exportAttributes(outfile, level, already_processed, namespace_, name_='BillOfMaterialIDType')
- def exportChildren(self, outfile, level, namespace_='', name_='BillOfMaterialIDType', fromsubclass_=False, pretty_print=True):
- super(BillOfMaterialIDType, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print)
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='BillOfMaterialIDType'):
+ super(BillOfMaterialIDType, self).exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='BillOfMaterialIDType')
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='BillOfMaterialIDType', fromsubclass_=False, pretty_print=True):
+ super(BillOfMaterialIDType, self).exportChildren(outfile, level, namespaceprefix_, name_, True, pretty_print=pretty_print)
pass
def build(self, node):
already_processed = set()
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index b1d7ed3..2f5acbe 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -776,7 +776,7 @@ class SpecialDate(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='pl:', name_='SpecialDate', namespacedef_='xmlns:pl="http://kuhlman.com/people.xsd"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='pl:', name_='SpecialDate', namespacedef_='xmlns:pl="http://kuhlman.com/people.xsd"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('SpecialDate')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -787,21 +787,21 @@ class SpecialDate(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='SpecialDate')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='SpecialDate')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='pl:', name_='SpecialDate', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='pl:', name_='SpecialDate', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='pl:', name_='SpecialDate'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='pl:', name_='SpecialDate'):
if self.SpecialProperty is not None and 'SpecialProperty' not in already_processed:
already_processed.add('SpecialProperty')
outfile.write(' SpecialProperty=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.SpecialProperty), input_name='SpecialProperty')), ))
- def exportChildren(self, outfile, level, namespace_='pl:', name_='SpecialDate', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='pl:', name_='SpecialDate', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
@@ -854,7 +854,7 @@ class ExtremeDate(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='pl:', name_='ExtremeDate', namespacedef_='xmlns:pl="http://kuhlman.com/people.xsd"', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='pl:', name_='ExtremeDate', namespacedef_='xmlns:pl="http://kuhlman.com/people.xsd"', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('ExtremeDate')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -865,21 +865,21 @@ class ExtremeDate(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='ExtremeDate')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='ExtremeDate')
if self.hasContent_():
outfile.write('>')
outfile.write(self.convert_unicode(self.valueOf_))
- self.exportChildren(outfile, level + 1, namespace_='pl:', name_='ExtremeDate', pretty_print=pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ self.exportChildren(outfile, level + 1, namespaceprefix_='pl:', name_='ExtremeDate', pretty_print=pretty_print)
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='pl:', name_='ExtremeDate'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='pl:', name_='ExtremeDate'):
if self.ExtremeProperty is not None and 'ExtremeProperty' not in already_processed:
already_processed.add('ExtremeProperty')
outfile.write(' ExtremeProperty=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.ExtremeProperty), input_name='ExtremeProperty')), ))
- def exportChildren(self, outfile, level, namespace_='pl:', name_='ExtremeDate', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='pl:', name_='ExtremeDate', fromsubclass_=False, pretty_print=True):
pass
def build(self, node):
already_processed = set()
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 1a9c411..df679f8 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -763,7 +763,7 @@ class simpleTypeTestsType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleTypeTestsType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleTypeTestsType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleTypeTestsType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -774,25 +774,25 @@ class simpleTypeTestsType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleTypeTestsType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleTypeTestsType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleTypeTestsType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleTypeTestsType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleTypeTestsType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleTypeTestsType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleTypeTestsType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleTypeTestsType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for simpleTypeTest_ in self.simpleTypeTest:
- simpleTypeTest_.export(outfile, level, namespace_, name_='simpleTypeTest', pretty_print=pretty_print)
+ simpleTypeTest_.export(outfile, level, namespaceprefix_, name_='simpleTypeTest', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -996,7 +996,7 @@ class simpleTypeTestDefs(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleTypeTestDefs', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleTypeTestDefs', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleTypeTestDefs')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1007,19 +1007,19 @@ class simpleTypeTestDefs(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleTypeTestDefs')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleTypeTestDefs')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleTypeTestDefs', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleTypeTestDefs', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleTypeTestDefs'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleTypeTestDefs'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleTypeTestDefs', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleTypeTestDefs', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/validate_simpletypes1_sup.py b/tests/validate_simpletypes1_sup.py
index 98d98e8..95122b1 100644
--- a/tests/validate_simpletypes1_sup.py
+++ b/tests/validate_simpletypes1_sup.py
@@ -814,7 +814,7 @@ class containerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='containerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='containerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('containerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -825,33 +825,33 @@ class containerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='containerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='containerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='containerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='containerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='containerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='containerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='containerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='containerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for sample1_ in self.sample1:
- sample1_.export(outfile, level, namespace_, name_='sample1', pretty_print=pretty_print)
+ sample1_.export(outfile, level, namespaceprefix_, name_='sample1', pretty_print=pretty_print)
for sample2_bad_ in self.sample2_bad:
- sample2_bad_.export(outfile, level, namespace_, name_='sample2_bad', pretty_print=pretty_print)
+ sample2_bad_.export(outfile, level, namespaceprefix_, name_='sample2_bad', pretty_print=pretty_print)
for sample3_bad_ in self.sample3_bad:
- sample3_bad_.export(outfile, level, namespace_, name_='sample3_bad', pretty_print=pretty_print)
+ sample3_bad_.export(outfile, level, namespaceprefix_, name_='sample3_bad', pretty_print=pretty_print)
for sample4_bad_ in self.sample4_bad:
- sample4_bad_.export(outfile, level, namespace_, name_='sample4_bad', pretty_print=pretty_print)
+ sample4_bad_.export(outfile, level, namespaceprefix_, name_='sample4_bad', pretty_print=pretty_print)
for sample2_ in self.sample2:
- sample2_.export(outfile, level, namespace_, name_='sample2', pretty_print=pretty_print)
+ sample2_.export(outfile, level, namespaceprefix_, name_='sample2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1242,7 +1242,7 @@ class simpleOneType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleOneType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleOneType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleOneType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1253,21 +1253,21 @@ class simpleOneType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleOneType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleOneType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleOneType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleOneType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleOneType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleOneType'):
if self.integer_range_1_value_with_default != "6" and 'integer_range_1_value_with_default' not in already_processed:
already_processed.add('integer_range_1_value_with_default')
outfile.write(' integer_range_1_value_with_default=%s' % (quote_attrib(self.integer_range_1_value_with_default), ))
- def exportChildren(self, outfile, level, namespace_='', name_='simpleOneType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleOneType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1567,7 +1567,7 @@ class simpleTwoType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleTwoType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleTwoType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleTwoType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1578,25 +1578,25 @@ class simpleTwoType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleTwoType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleTwoType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleTwoType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleTwoType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleTwoType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleTwoType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleTwoType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleTwoType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.simpleTwoElementOne is not None:
- self.simpleTwoElementOne.export(outfile, level, namespace_, name_='simpleTwoElementOne', pretty_print=pretty_print)
+ self.simpleTwoElementOne.export(outfile, level, namespaceprefix_, name_='simpleTwoElementOne', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1652,7 +1652,7 @@ class simpleTwoElementOneType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleTwoElementOneType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleTwoElementOneType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleTwoElementOneType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1663,19 +1663,19 @@ class simpleTwoElementOneType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleTwoElementOneType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleTwoElementOneType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleTwoElementOneType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleTwoElementOneType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleTwoElementOneType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleTwoElementOneType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleTwoElementOneType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleTwoElementOneType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tests/validate_simpletypes2_sup.py b/tests/validate_simpletypes2_sup.py
index 98d98e8..95122b1 100644
--- a/tests/validate_simpletypes2_sup.py
+++ b/tests/validate_simpletypes2_sup.py
@@ -814,7 +814,7 @@ class containerType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='containerType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='containerType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('containerType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -825,33 +825,33 @@ class containerType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='containerType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='containerType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='containerType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='containerType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='containerType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='containerType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='containerType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='containerType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
for sample1_ in self.sample1:
- sample1_.export(outfile, level, namespace_, name_='sample1', pretty_print=pretty_print)
+ sample1_.export(outfile, level, namespaceprefix_, name_='sample1', pretty_print=pretty_print)
for sample2_bad_ in self.sample2_bad:
- sample2_bad_.export(outfile, level, namespace_, name_='sample2_bad', pretty_print=pretty_print)
+ sample2_bad_.export(outfile, level, namespaceprefix_, name_='sample2_bad', pretty_print=pretty_print)
for sample3_bad_ in self.sample3_bad:
- sample3_bad_.export(outfile, level, namespace_, name_='sample3_bad', pretty_print=pretty_print)
+ sample3_bad_.export(outfile, level, namespaceprefix_, name_='sample3_bad', pretty_print=pretty_print)
for sample4_bad_ in self.sample4_bad:
- sample4_bad_.export(outfile, level, namespace_, name_='sample4_bad', pretty_print=pretty_print)
+ sample4_bad_.export(outfile, level, namespaceprefix_, name_='sample4_bad', pretty_print=pretty_print)
for sample2_ in self.sample2:
- sample2_.export(outfile, level, namespace_, name_='sample2', pretty_print=pretty_print)
+ sample2_.export(outfile, level, namespaceprefix_, name_='sample2', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1242,7 +1242,7 @@ class simpleOneType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleOneType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleOneType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleOneType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1253,21 +1253,21 @@ class simpleOneType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleOneType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleOneType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleOneType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleOneType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleOneType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleOneType'):
if self.integer_range_1_value_with_default != "6" and 'integer_range_1_value_with_default' not in already_processed:
already_processed.add('integer_range_1_value_with_default')
outfile.write(' integer_range_1_value_with_default=%s' % (quote_attrib(self.integer_range_1_value_with_default), ))
- def exportChildren(self, outfile, level, namespace_='', name_='simpleOneType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleOneType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
@@ -1567,7 +1567,7 @@ class simpleTwoType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleTwoType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleTwoType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleTwoType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1578,25 +1578,25 @@ class simpleTwoType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleTwoType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleTwoType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleTwoType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleTwoType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleTwoType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleTwoType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleTwoType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleTwoType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
eol_ = ''
if self.simpleTwoElementOne is not None:
- self.simpleTwoElementOne.export(outfile, level, namespace_, name_='simpleTwoElementOne', pretty_print=pretty_print)
+ self.simpleTwoElementOne.export(outfile, level, namespaceprefix_, name_='simpleTwoElementOne', pretty_print=pretty_print)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -1652,7 +1652,7 @@ class simpleTwoElementOneType(GeneratedsSuper):
return True
else:
return False
- def export(self, outfile, level, namespace_='', name_='simpleTwoElementOneType', namespacedef_='', pretty_print=True):
+ def export(self, outfile, level, namespaceprefix_='', name_='simpleTwoElementOneType', namespacedef_='', pretty_print=True):
imported_ns_def_ = GenerateDSNamespaceDefs_.get('simpleTwoElementOneType')
if imported_ns_def_ is not None:
namespacedef_ = imported_ns_def_
@@ -1663,19 +1663,19 @@ class simpleTwoElementOneType(GeneratedsSuper):
if self.original_tagname_ is not None:
name_ = self.original_tagname_
showIndent(outfile, level, pretty_print)
- outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+ outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
already_processed = set()
- self.exportAttributes(outfile, level, already_processed, namespace_, name_='simpleTwoElementOneType')
+ self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='simpleTwoElementOneType')
if self.hasContent_():
outfile.write('>%s' % (eol_, ))
- self.exportChildren(outfile, level + 1, namespace_='', name_='simpleTwoElementOneType', pretty_print=pretty_print)
+ self.exportChildren(outfile, level + 1, namespaceprefix_='', name_='simpleTwoElementOneType', pretty_print=pretty_print)
showIndent(outfile, level, pretty_print)
- outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
+ outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
else:
outfile.write('/>%s' % (eol_, ))
- def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='simpleTwoElementOneType'):
+ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='simpleTwoElementOneType'):
pass
- def exportChildren(self, outfile, level, namespace_='', name_='simpleTwoElementOneType', fromsubclass_=False, pretty_print=True):
+ def exportChildren(self, outfile, level, namespaceprefix_='', name_='simpleTwoElementOneType', fromsubclass_=False, pretty_print=True):
if pretty_print:
eol_ = '\n'
else:
diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html
index 5ecb044..1036d4f 100644
--- a/tutorial/generateds_tutorial.html
+++ b/tutorial/generateds_tutorial.html
@@ -219,7 +219,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.23</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.24</td>
</tr>
</tbody>
</table>
@@ -228,7 +228,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">August 16, 2018</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">August 27, 2018</td>
</tr>
</tbody>
</table>
@@ -1210,7 +1210,7 @@ named <tt class="docutils literal">garden_api.py</tt>, you can create an instanc
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_tutorial.txt">View document source</a>.
-Generated on: 2018-08-16 22:29 UTC.
+Generated on: 2018-08-27 21:50 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt
index dddd8f7..f1060a1 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
-:revision: 2.29.23
+:revision: 2.29.24
.. version
diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip
index b1d6245bda6c9fa3d2b918bc5768299980209f80..d7c3931dcdc7fe64e45b9c09b21457cac2088174 100644
GIT binary patch
delta 13074
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
U(^76aF;i6g7@;gX|980m3)EStsQ>@~
delta 13054
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
--
GitLab