Commit a3537011 authored by Dave Kuhlman's avatar Dave Kuhlman

v. 2.29.24 Changed namespace_ to namespaceprefix_ for clarity

parent 1b05d1d6
......@@ -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:
......@@ -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>
......
This diff is collapsed.
......@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
:revision: 2.29.23
:revision: 2.29.24
.. version
......
......@@ -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>
......
......@@ -12,7 +12,7 @@ GenerateDS GUI Notes
.. version
:revision: 2.29.23
:revision: 2.29.24
.. version
......
......@@ -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##
......
......@@ -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>
......
......@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
:revision: 2.29.23
:revision: 2.29.24
.. version
......
......@@ -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 = {}
......
......@@ -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",
......
......@@ -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)
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
This diff is collapsed.
......@@ -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:
......
......@@ -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)