diff --git a/README.rst b/README.rst
index 3cd952bf001976e2cdcc774356376f2ac402198b..947c2d4b01370e4095c35a70588d9cbdb3f1d9d7 100644
--- a/README.rst
+++ b/README.rst
@@ -141,6 +141,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.28c (10/17/2017)
+
+- Fix for generation of GDSClassesMapping dictionary. Formerly, we
+ were generating entries in this dictionary for some xs:element
+ items that were not at top level. Fixed so that only xs:element
+ items at top level (immediately under the root/schema node) are
+ included in this dictionary. Thanks to Christin Gunning for
+ reporting this and for guiding me on this change.
+
Version 2.28b (08/22/2017)
- Fix for Django models and forms generation -- "float" data type
diff --git a/generateDS.html b/generateDS.html
index 827ef04b8dfa054c78b2bf6b28b6716c5a40e1ab..11b7be4251b157571799ab67b8c9b8b8557142c3 100644
--- a/generateDS.html
+++ b/generateDS.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>generateDS -- Generate Data Structures from XML Schema</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -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.28b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28c</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 22, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">October 17, 2017</td>
</tr>
</tbody>
</table>
@@ -3380,7 +3380,7 @@ following among others:</p>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateDS.txt">View document source</a>.
-Generated on: 2017-08-22 19:57 UTC.
+Generated on: 2017-10-17 23:02 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 05ab66a16e0c7ab0f553b486ce7924da20072727..435cfa11665244f5b42a1d851cb09bcaf6a23eb9 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -227,7 +227,7 @@ logging.disable(logging.INFO)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.28b'
+VERSION = '2.28c'
##VERSION##
if sys.version_info.major == 2:
@@ -5967,11 +5967,32 @@ if __name__ == '__main__':
def generateMain(outfile, prefix, root, generatedClasses):
lines = []
- for classType in MappingTypes:
- mappedName = mapName(cleanupName(MappingTypes[classType]))
- if mappedName in generatedClasses:
- lines.append(" '%s': %s%s,\n" % (
- classType, prefix, mappedName, ))
+ nsmap = SchemaLxmlTree.nsmap.copy()
+ if None in nsmap:
+ ns_prefix = nsmap.get(None)
+ del nsmap[None]
+ if 'xs' not in nsmap:
+ nsmap['xs'] = ns_prefix
+ if 'xs' not in nsmap and 'xsd' in nsmap:
+ nsmap['xs'] = nsmap['xsd']
+ top_lvl_elements = SchemaLxmlTree.xpath(
+ './xs:element', namespaces=nsmap)
+ for element in top_lvl_elements:
+ if 'ref' in element.attrib:
+ classType = element.attrib.get('ref')
+ name = classType
+ else:
+ classType = element.attrib.get('type')
+ name = element.attrib.get('name')
+ if classType is not None and name is not None:
+ _, classType = get_prefix_and_value(classType)
+ _, name = get_prefix_and_value(name)
+ mappedClassType = mapName(cleanupName(classType))
+ mappedName = mapName(name)
+ if (mappedClassType and mappedName and
+ mappedClassType in generatedClasses):
+ lines.append(" '%s': %s%s,\n" % (
+ mappedName, prefix, mappedClassType, ))
lines.sort()
exportDictLine = "GDSClassesMapping = {{\n{}}}\n\n\n".format(
''.join(lines))
@@ -6680,8 +6701,6 @@ def generate(outfileName, subclassFilename, behaviorFilename,
generatedClasses = set()
outfile = None
outfile = makeFile(outfileName)
- if not outfile:
- outfile = os.tmpfile()
wrt = outfile.write
processed = []
externalImports = getImportsForExternalXsds(root)
@@ -6747,7 +6766,7 @@ def makeFile(outFileName):
sys.stderr.write(
'File %s exists. Change output file or use -f (force).\n' %
outFileName)
- sys.exit(1)
+ sys.exit('Exiting. No output file.')
else:
if sys.version_info.major == 2:
reply = raw_input(
@@ -6757,6 +6776,8 @@ def makeFile(outFileName):
'File %s exists. Overwrite? (y/n): ' % outFileName)
if reply == 'y':
outFile = open(outFileName, 'w')
+ else:
+ sys.exit('Exiting. No output file.')
else:
outFile = open(outFileName, 'w')
return outFile
diff --git a/generateDS.txt b/generateDS.txt
index 58303ba2674d5b44419fb8d693e5c144fea7093a..70b78ddd7be73a8647e36f650dee839c5f277e22 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
-:revision: 2.28b
+:revision: 2.28c
.. version
diff --git a/generateds_gui_notes.html b/generateds_gui_notes.html
index 37cf9c73abf26cb042f1067f46f9e7f389606f1e..247926899cc03767c3249890ae4190ebaa7f981e 100644
--- a/generateds_gui_notes.html
+++ b/generateds_gui_notes.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>GenerateDS GUI Notes</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -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.28b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28c</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 22, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">October 17, 2017</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: 2017-08-22 19:57 UTC.
+Generated on: 2017-10-17 23:02 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 2783eda537ffca6c01f4d5521e7dfcf9c871cda8..3a247b8b2b5fa577803b92187f0c46a4ebbad110 100644
--- a/generateds_gui_notes.txt
+++ b/generateds_gui_notes.txt
@@ -12,7 +12,7 @@ GenerateDS GUI Notes
.. version
-:revision: 2.28b
+:revision: 2.28c
.. version
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index 2f127e3a4930569e41d7c64301fc1ee227a0c37a..11d4df3573219157bf8885f525c710e186b37b19 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.28b'
+VERSION = '2.28c'
##VERSION##
diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html
index a1de32b62324ac1a45796bd4c5f5546d5873b979..8f1804cdce4b6c47811569a03a87cd52cc082db6 100644
--- a/librarytemplate_howto.html
+++ b/librarytemplate_howto.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>How to package a generateDS.py generated library</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -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.28b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28c</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 22, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">October 17, 2017</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: 2017-08-22 19:57 UTC.
+Generated on: 2017-10-17 23:02 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 6eee10795c7935c0689976e26c8667d7c2dad5d4..b7c0427c77d9f02a2fa3e44b9a391b53dd65dec7 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
-:revision: 2.28b
+:revision: 2.28c
.. version
diff --git a/process_includes.py b/process_includes.py
index e3742527d60f93154c1cfa0a79e8dd8a864e8f36..44994d45b117799c3a6d39f9bf6ce88f51fd7195 100644
--- 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.28b'
+VERSION = '2.28c'
##VERSION##
CatalogDict = {}
diff --git a/setup.py b/setup.py
index f9f366a045423bb7fa0e5e43db7d085bd5cc4b06..b9cc2157da1d88bf01064b5f6ab03775cae0c704 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ setup(name="generateDS",
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
- version="2.28b",
+ version="2.28c",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index 7c88aa9477cc107eedc47d22a2d936784727575c..c75e149ee1e7fd7dce3e2be3369f98062fab1e38 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index 561cf1e6fe18a3076c5f56d0d8f4b2809efc9d93..c153546ffeb73fe27a757f835742e771768bc927 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -878,7 +878,6 @@ class oneperType01_2(GeneratedsSuper):
GDSClassesMapping = {
- 'inner01': oneperType01_2,
'root01': oneperType01_1,
}
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index 095fbb7e62421928555627f75a774d2c28e740f5..7124e4fe62721cc4bdf8e5ee130c71977782a8ed 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -878,7 +878,6 @@ class oneperType02_2(GeneratedsSuper):
GDSClassesMapping = {
- 'inner01': oneperType02_2,
'root02': oneperType02_1,
}
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index 738a6dd0f1cd80a0ab8824942bed37003f27bb44..1d53731875c20eef76ee4f6679ae6c189e1342f3 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/abstract_type1_sub.py b/tests/abstract_type1_sub.py
index 7895f4e6b586450cb529f0b08a21703085697142..4be8db1dfebd3d274f91f12278938a0d7c348d81 100644
--- a/tests/abstract_type1_sub.py
+++ b/tests/abstract_type1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index 76b59cc656136428ebea8337c3077d085cea751e..15da5d65403015ff74506d9a1f4f37c7b1d0e011 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1014,7 +1014,6 @@ class Plane(Vehicle):
GDSClassesMapping = {
'carrier': carrierType,
- 'fleet': Vehicle,
}
diff --git a/tests/annotations1_sub.py b/tests/annotations1_sub.py
index eab0241b463399c6b7a570c8195a476c1154e0ce..bfa0bb3f873d1128ee92326bf73330cb86c06460 100644
--- a/tests/annotations1_sub.py
+++ b/tests/annotations1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index 6ee0fb0c68291c5d4d69ca2e9760e70fcc442567..3800940e4c5c8d9d36a1a563a76eebd7db849062 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1005,9 +1005,7 @@ class document3Type(GeneratedsSuper):
GDSClassesMapping = {
- 'anotherdoc': document3Type,
'document1': document1Type,
- 'otherdoc': document2Type,
}
diff --git a/tests/anonymous_type1_sub.py b/tests/anonymous_type1_sub.py
index 4969be809fbf266a11ab68583777b7f023e1ddda..02b27ee94a77e70d779d79653614f2a23be99001 100644
--- a/tests/anonymous_type1_sub.py
+++ b/tests/anonymous_type1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index c5097e2cd4b77cceb35b9982259c9e11095bb0b3..9456e9a8513805735948aaf21409e05934cbb2ac 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1073,9 +1073,6 @@ class BazType3(GeneratedsSuper):
GDSClassesMapping = {
- 'Bar': BarType2,
- 'Baz': BazType3,
- 'Foo': FooType1,
}
diff --git a/tests/anysimpletype1_sub.py b/tests/anysimpletype1_sub.py
index 6689ed9af3756a9a265662c6106705dc33dd3eea..dacb67376b9e0ae97a0e350b110e015a39667159 100644
--- a/tests/anysimpletype1_sub.py
+++ b/tests/anysimpletype1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index 9dc2df861f06f942ed47be3b39db21b9cb7c6a1a..763bc8fb87dc3846e31d9b418f964dadd21a73ce 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -903,7 +903,6 @@ class cimAnySimpleType(GeneratedsSuper):
GDSClassesMapping = {
- 'test1member': cimAnySimpleType,
}
diff --git a/tests/anywildcard1_sub.py b/tests/anywildcard1_sub.py
index c58ae95d909ba8a8f3cb8e681b2a2619f28c2b9c..dbaa90dc9d8fe1139117318e65f243b735a2299d 100644
--- a/tests/anywildcard1_sub.py
+++ b/tests/anywildcard1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 51bc9cfa9b52bb79913efeb6a02bd1776f052793..fce01282fe7597fa748292be626e4aaf1e3b4ef1 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1255,7 +1255,6 @@ class PlantType_multiple_nochild(GeneratedsSuper):
GDSClassesMapping = {
- 'description': DescriptionType,
}
diff --git a/tests/attr_groups1_sub.py b/tests/attr_groups1_sub.py
index 21a53f56077612143240a0bd0f3ac4271db29e0e..aaf81568bb95348f8e346c61a3cac766bdea7acd 100644
--- a/tests/attr_groups1_sub.py
+++ b/tests/attr_groups1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index 489d8259ac775fa54627ad5cdfaa294fa2cbc273..7afbdc73e2af83af4b8023d989de65c7df58899d 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/catalogtest1_sub.py b/tests/catalogtest1_sub.py
index 6be03bedecff8c9b38afd46cc81ee9395c5ca133..4774abd39163dfde18280a3be6ae7c72bc28c67c 100644
--- a/tests/catalogtest1_sub.py
+++ b/tests/catalogtest1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/catalogtest1_sup.py b/tests/catalogtest1_sup.py
index 1d2f9cf2a07a309f6db97cf8daeda7b3d893de33..b82c2b2b0322a617b36f4965df21aa431a9bf7cd 100644
--- a/tests/catalogtest1_sup.py
+++ b/tests/catalogtest1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/cdata1_sub.py b/tests/cdata1_sub.py
index d9bde8cfa1562752bcd72fb4a0abfe6dbedb0dbe..df6db6d4d8fa15e54bfd601f89b2edf0a446f28a 100644
--- a/tests/cdata1_sub.py
+++ b/tests/cdata1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/cdata1_sup.py b/tests/cdata1_sup.py
index ed4c2baba1e265930838014966794dec99085627..0957622ab93d8579939d0fc5c4c50b757df0fd04 100644
--- a/tests/cdata1_sup.py
+++ b/tests/cdata1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -873,7 +873,6 @@ class cdataType(GeneratedsSuper):
GDSClassesMapping = {
'cdata': cdataListType,
- 'cdatalist': cdataType,
}
diff --git a/tests/cleanupname1_sub.py b/tests/cleanupname1_sub.py
index 6a1acf07f1601abe9104277c468a2101370fe3a5..d908e0dee6f7ae5922e52d68720e4d1d94281261 100644
--- a/tests/cleanupname1_sub.py
+++ b/tests/cleanupname1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/cleanupname1_sup.py b/tests/cleanupname1_sup.py
index 83950e720606fb31a3a8aa34ec3ccf45af3a8331..b0a7c886f6645eb404e989abb1a38ceadaf09450 100644
--- a/tests/cleanupname1_sup.py
+++ b/tests/cleanupname1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1223,11 +1223,6 @@ class dataTypeNNNMNNN(GeneratedsSuper):
GDSClassesMapping = {
'data': dataKind,
- 'data1': data1Kind,
- 'data2': MlassData2,
- 'data3': RealTypeData3,
- 'data4': MMMMMMdataKind,
- 'data5': dataTypeNNNMNNN,
}
diff --git a/tests/defaults_cases1_sub.py b/tests/defaults_cases1_sub.py
index ee44fea2d0a0ef96ce67fcd4335a982857c13ac2..f3dfdcea67c59a563ceee80e51bcceea2fe25308 100644
--- a/tests/defaults_cases1_sub.py
+++ b/tests/defaults_cases1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/defaults_cases1_sup.py b/tests/defaults_cases1_sup.py
index 558b8630d8ce0687318e993e5e6beb4d5dde80e5..98a3b4bba6ef7a727f225b0a10c9271e3dbc8b36 100644
--- a/tests/defaults_cases1_sup.py
+++ b/tests/defaults_cases1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1107,8 +1107,6 @@ class DefaultType2(GeneratedsSuper):
GDSClassesMapping = {
- 'default1': DefaultType1,
- 'default2': DefaultType2,
'defaults': DefaultTypes,
}
diff --git a/tests/defaults_coverage1_sub.py b/tests/defaults_coverage1_sub.py
index 776bf458bbdabc6531ccf952a660fe6a1202905a..ed08d0deac2dbc0bc427eb5f2a12fb44297865a2 100644
--- a/tests/defaults_coverage1_sub.py
+++ b/tests/defaults_coverage1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/defaults_coverage1_sup.py b/tests/defaults_coverage1_sup.py
index 51e722732ed2e529258cd7dba2be05dbf4f6e83d..80defc275f2d5106c1145d6b6cde65f1642bc43b 100644
--- a/tests/defaults_coverage1_sup.py
+++ b/tests/defaults_coverage1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1470,8 +1470,6 @@ class DefaultType2(GeneratedsSuper):
GDSClassesMapping = {
- 'default1': DefaultType1,
- 'default2': DefaultType2,
'defaults': DefaultTypes,
}
diff --git a/tests/disable_xml_super1_sub.py b/tests/disable_xml_super1_sub.py
index e7184a2731cd7ddc414455deb15a5c3ab7c8eee4..abac98f68293a366f3fedb8d9e7a878463c4e73c 100644
--- a/tests/disable_xml_super1_sub.py
+++ b/tests/disable_xml_super1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/disable_xml_super1_sup.py b/tests/disable_xml_super1_sup.py
index db04580e5d0387e444de804f2a769b289629c447..867ad928a5905b39d9d2f9b66293ac7d11c1edbe 100644
--- a/tests/disable_xml_super1_sup.py
+++ b/tests/disable_xml_super1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/extensions1_sub.py b/tests/extensions1_sub.py
index 3a3919fe0b57ca01eb007ce7dee65a25390fe66a..52b0523c4b492c26e90b1292e56a7f13bd037ad7 100644
--- a/tests/extensions1_sub.py
+++ b/tests/extensions1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index a3351f91173fe7cb805bfcc6cf4ca72800ac69f0..1d87f057895187c7840f00385b6cbb81e1812a15 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1785,8 +1785,6 @@ class MyDouble(GeneratedsSuper):
GDSClassesMapping = {
'container': containerType,
- 'mixedfactoid': mixedFactoidType,
- 'simplefactoid': simpleFactoidType,
}
diff --git a/tests/ipo1_sub.py b/tests/ipo1_sub.py
index 4fd7fcb4015906883beae0f9cd9feb5a38c8402e..425e9e16e0828267e9b847261575f32753af55ea 100644
--- a/tests/ipo1_sub.py
+++ b/tests/ipo1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/ipo1_sup.py b/tests/ipo1_sup.py
index af04ab38b4a483a732552d915036213645ac7c78..2a1363a5cbb1976b68594678f9637d0606221128 100644
--- a/tests/ipo1_sup.py
+++ b/tests/ipo1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1458,10 +1458,7 @@ class UKAddress(Address):
GDSClassesMapping = {
- 'billTo': Address,
- 'items': Items,
'purchaseOrder': PurchaseOrderType,
- 'shipTo': Address,
}
diff --git a/tests/ipo2_sub.py b/tests/ipo2_sub.py
index 4fd7fcb4015906883beae0f9cd9feb5a38c8402e..425e9e16e0828267e9b847261575f32753af55ea 100644
--- a/tests/ipo2_sub.py
+++ b/tests/ipo2_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/ipo2_sup.py b/tests/ipo2_sup.py
index af04ab38b4a483a732552d915036213645ac7c78..2a1363a5cbb1976b68594678f9637d0606221128 100644
--- a/tests/ipo2_sup.py
+++ b/tests/ipo2_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1458,10 +1458,7 @@ class UKAddress(Address):
GDSClassesMapping = {
- 'billTo': Address,
- 'items': Items,
'purchaseOrder': PurchaseOrderType,
- 'shipTo': Address,
}
diff --git a/tests/mapcleanname1_sub.py b/tests/mapcleanname1_sub.py
index d1ff8c1a006f554821bb1d4e931bc7470b42fbf4..88bbf3c0b3b61e7bc8dc959861fb77a151e84fe6 100644
--- a/tests/mapcleanname1_sub.py
+++ b/tests/mapcleanname1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py
index 257c9b94d9e8e188fed31e8f5033fe7355e84042..5ff85364b34454ceff49acc96f5887dbe2e8833e 100644
--- a/tests/mapcleanname1_sup.py
+++ b/tests/mapcleanname1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1570,7 +1570,6 @@ class complex_type05(build_):
GDSClassesMapping = {
- 'field01': complex_type02,
}
diff --git a/tests/nested_def1_sub.py b/tests/nested_def1_sub.py
index e13ea3161940bab9acf2fa0497fc0b8394f55a31..bf895cbf8fee7611dcca0cb4dc59e2f204e5af20 100644
--- a/tests/nested_def1_sub.py
+++ b/tests/nested_def1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/nested_def1_sup.py b/tests/nested_def1_sup.py
index 1d54e5aee5de4720202e64f4c44f9674567c1920..e9baab1c372f51f38f29601e4ad2134cacd6789c 100644
--- a/tests/nested_def1_sup.py
+++ b/tests/nested_def1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1122,9 +1122,6 @@ GDSClassesMapping = {
'classA': classAType,
'classB': classBType,
'container': containerType,
- 'inner': innerType1,
- 'item1': classAType,
- 'item2': classBType,
}
diff --git a/tests/out1_sub.py b/tests/out1_sub.py
index fa69988fc584a3192211756145df1cfa9d538996..892cf4d0120cff6c1abbb8aa3d57e99598fdb35b 100644
--- a/tests/out1_sub.py
+++ b/tests/out1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index ed5fc329400c60fd1bf29d526f2c4a08d3a2b1f0..97b8fe9157df407536e7804147056b3070f2f13a 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -3505,9 +3505,6 @@ class client_handlerType(GeneratedsSuper):
GDSClassesMapping = {
- 'client-handler': client_handlerType,
- 'elparam': param,
- 'promoter': booster,
}
diff --git a/tests/people_procincl1_sub.py b/tests/people_procincl1_sub.py
index bdb5d63826cb319930b9817d7094e29d9fdae4a5..539398bedd1dbe0e1004617e38a2248da02d5a57 100644
--- a/tests/people_procincl1_sub.py
+++ b/tests/people_procincl1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index da0eeba061680dde97ba97ea6e22d3ac3c6e0206..19e97f2fb4c456d51cb44d33cb1c992fa86e18bd 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -2901,9 +2901,6 @@ class python_programmer(programmer):
GDSClassesMapping = {
- 'client-handler': client_handlerType,
- 'elparam': param,
- 'promoter': booster,
}
diff --git a/tests/prefix_classname1_sub.py b/tests/prefix_classname1_sub.py
index 18c80fcf75b5d8a673f01d7ab36a43c4fa94583f..512463cc30605ddf880f2178483d0b7f96a8b195 100644
--- a/tests/prefix_classname1_sub.py
+++ b/tests/prefix_classname1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py
index 92afac27781dcfcb5da486785167a9fa32b76634..762f4241093c6ccbbcdad997bba9dd51a76445ed 100644
--- a/tests/prefix_classname1_sup.py
+++ b/tests/prefix_classname1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -2510,9 +2510,6 @@ class tomato_client_handlerType(GeneratedsSuper):
GDSClassesMapping = {
- 'client-handler': tomato_client_handlerType,
- 'elparam': tomato_param,
- 'promoter': tomato_booster,
}
diff --git a/tests/recursive_simpletype1_sub.py b/tests/recursive_simpletype1_sub.py
index 8518e2d2604f6cac54625f11a18e8f1fcadbe6ec..9da5ea3648701c46acdd4b2d2dc26d5078f99b3e 100644
--- a/tests/recursive_simpletype1_sub.py
+++ b/tests/recursive_simpletype1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index 7a2e836b0104940bc470072fdc720f28028e81c3..2780b8e8b1d258eef0dc9b605cdb65a7afa158ff 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/reference_simpletype1_sub.py b/tests/reference_simpletype1_sub.py
index 84a31d327379e5aea4c0e6d7031b8945ace71ba0..497a011a24dd8ab929af8652bcc677c7cc4d601a 100644
--- a/tests/reference_simpletype1_sub.py
+++ b/tests/reference_simpletype1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/reference_simpletype1_sup.py b/tests/reference_simpletype1_sup.py
index 941fa284cac920193615b76d0d9f8761d1305a4b..c3511496e78e0d0839804df4ea0ad6de59d6f3c9 100644
--- a/tests/reference_simpletype1_sup.py
+++ b/tests/reference_simpletype1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/rem_dup_elems.xsd b/tests/rem_dup_elems.xsd
index 5cb3ed37882eb18f272124602b21e125945da046..ffa32253523944798a749e525123097af50cbc8c 100644
--- a/tests/rem_dup_elems.xsd
+++ b/tests/rem_dup_elems.xsd
@@ -1,5 +1,5 @@
<xsd:schema
- xmlns:xsd="http://www.w3.org/2000/10/XMLSchema"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
>
<xsd:element name="authors" type="authorsType" />
diff --git a/tests/rem_dup_elems1_sub.py b/tests/rem_dup_elems1_sub.py
index 4f13ab12d9dea990b06abddf136b50c94c95ac70..e90ed7f00ad5111a40e1516be6adc148150fb277 100644
--- a/tests/rem_dup_elems1_sub.py
+++ b/tests/rem_dup_elems1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/rem_dup_elems1_sup.py b/tests/rem_dup_elems1_sup.py
index cee76401f3b056905ef1963bfd657574acee7fc6..fdd2362db89b3c39dfba729023521da93868543f 100644
--- a/tests/rem_dup_elems1_sup.py
+++ b/tests/rem_dup_elems1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simplecontent_restriction1_sub.py b/tests/simplecontent_restriction1_sub.py
index 580c6d234d8d04f0375359448c11157dab4d648b..d6902ec825a010b67349f7cf816c20e3c9bd1a1f 100644
--- a/tests/simplecontent_restriction1_sub.py
+++ b/tests/simplecontent_restriction1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index 7056a1993ec3ca96015b177b505bfc097767579c..f314128dce5a954b3e6c6f697b5420952f829145 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletype_memberspecs1_sub.py b/tests/simpletype_memberspecs1_sub.py
index a260c8867cd9e90c548e2202f6581c7ec0a33777..6fb792df3a3fa49a857a1a85e006912c32040159 100644
--- a/tests/simpletype_memberspecs1_sub.py
+++ b/tests/simpletype_memberspecs1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index 307d905dd0d5c503e658aeb394effa6f347efb3c..aaeba3db984a6d2baf80328bffc7e10de7a8bae5 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletypes_other1_sub.py b/tests/simpletypes_other1_sub.py
index 6afe08913fccf87d96cfeaa97c4c7fd3c2373164..4ca865bcf78b82f3a235cb650012347c219bd1f8 100644
--- a/tests/simpletypes_other1_sub.py
+++ b/tests/simpletypes_other1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 1dcf61fe1579625e8c7b5d89638655963eedcdfe..e3c05a322943a9ae85cec1380fc116306702f301 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1211,7 +1211,6 @@ class simpleTypeTestDefs(GeneratedsSuper):
GDSClassesMapping = {
- 'simpleTypeTest': simpleTypeTestDefs,
'simpleTypeTests': simpleTypeTestsType,
}
diff --git a/tests/to_etree1_sub.py b/tests/to_etree1_sub.py
index 300d89ca58e0edee7604e04843f5b37a4346a233..bf225acedef97a555b4573f26055ae4db13dd3e7 100644
--- a/tests/to_etree1_sub.py
+++ b/tests/to_etree1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index 17befe2ef32d5d16406ad879958ca045bbba4862..bd1b58f75fe439ff6c17a0503da9f494d0832a34 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -2937,16 +2937,13 @@ class client_handlerType(GeneratedsSuper):
GDSClassesMapping = {
'agent': agentType,
'booster': boosterType,
- 'client-handler': client_handlerType,
'comments': commentsType,
- 'elparam': paramType,
'info': infoType,
'java-programmer': java_programmerType,
'param': paramType,
'people': peopleType,
'person': personType,
'programmer': programmerType,
- 'promoter': boosterType,
'python-programmer': python_programmerType,
'special-agent': special_agentType,
'vehicle': vehicleType,
diff --git a/tests/validate_simpletypes1_sub.py b/tests/validate_simpletypes1_sub.py
index 3edf739f1638255b12f0c0d5f834a2fe097f33a3..f0f89035ae18709c6a19442b50eeee2604fbcc28 100644
--- a/tests/validate_simpletypes1_sub.py
+++ b/tests/validate_simpletypes1_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/validate_simpletypes1_sup.py b/tests/validate_simpletypes1_sup.py
index d159830a2b653772af07d8da5b85a8f1a33a6278..85f44cda31042bedc434c04ec15929ad6408a38d 100644
--- a/tests/validate_simpletypes1_sup.py
+++ b/tests/validate_simpletypes1_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1646,12 +1646,6 @@ class simpleTwoElementOneType(GeneratedsSuper):
GDSClassesMapping = {
'container': containerType,
- 'sample1': simpleOneType,
- 'sample2': simpleTwoType,
- 'sample2_bad': simpleOneType,
- 'sample3_bad': simpleOneType,
- 'sample4_bad': simpleOneType,
- 'simpleTwoElementOne': simpleTwoElementOneType,
'simpleTypeData': simpleTwoType,
}
diff --git a/tests/validate_simpletypes2_sub.py b/tests/validate_simpletypes2_sub.py
index 3edf739f1638255b12f0c0d5f834a2fe097f33a3..f0f89035ae18709c6a19442b50eeee2604fbcc28 100644
--- a/tests/validate_simpletypes2_sub.py
+++ b/tests/validate_simpletypes2_sub.py
@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
diff --git a/tests/validate_simpletypes2_sup.py b/tests/validate_simpletypes2_sup.py
index d159830a2b653772af07d8da5b85a8f1a33a6278..85f44cda31042bedc434c04ec15929ad6408a38d 100644
--- a/tests/validate_simpletypes2_sup.py
+++ b/tests/validate_simpletypes2_sup.py
@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
-# Python 2.7.13 (default, May 2 2017, 14:07:15) [GCC 6.3.0 20170406]
+# Python 2.7.13 (default, Jan 19 2017, 14:48:08) [GCC 6.3.0 20170118]
#
# Command line options:
# ('--no-dates', '')
@@ -1646,12 +1646,6 @@ class simpleTwoElementOneType(GeneratedsSuper):
GDSClassesMapping = {
'container': containerType,
- 'sample1': simpleOneType,
- 'sample2': simpleTwoType,
- 'sample2_bad': simpleOneType,
- 'sample3_bad': simpleOneType,
- 'sample4_bad': simpleOneType,
- 'simpleTwoElementOne': simpleTwoElementOneType,
'simpleTypeData': simpleTwoType,
}
diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html
index fa7972fe0640858f8fb368c7a223abfddbf1d3f6..3d47d0e91a63cb2ae156a0bfa2e2b9d4875a235d 100644
--- a/tutorial/generateds_tutorial.html
+++ b/tutorial/generateds_tutorial.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14rc2.dev: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>generateDS -- Introduction and Tutorial</title>
<meta name="author" content="Dave Kuhlman" />
<style type="text/css">
@@ -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.28b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.28c</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 22, 2017</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">October 17, 2017</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: 2017-08-22 19:57 UTC.
+Generated on: 2017-10-17 23:02 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 1799a52c4e892a6bc39d2371a847f8ad72652514..a6b58d9c85d632cb8a84fc9587be461c6da57cd8 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
-:revision: 2.28b
+:revision: 2.28c
.. version
diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip
index 2f74d7acf124128c19fcfa4076aafdc1252d6cb1..676114fd0f335a01efc2f88ff7c37796030dd3ef 100644
Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ