diff --git a/README.rst b/README.rst index f718ac813dcac8c0c0237eaaf260cdb8758a3667..1e04616f4b93c1a575732438bd24454b12cb9749 100644 --- a/README.rst +++ b/README.rst @@ -141,6 +141,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Change history -------------- +Version 2.29.10 (03/14/2018) + +- Fix to resolution of child types -- Formerly, we were adding some + unnecessary and unwanted entries to `fqnToElementDict`, which + caused the look-up to get the wrong type. Thanks to Olof Kindgren + for guiding me through this. + Version 2.29.9 (03/02/2018) - Added command line flag --always-export-default diff --git a/generateDS.html b/generateDS.html index 5d7fc3d64afcdd95dbdae242558ecbba50507f76..da8d74c19d730410a418e88bf59b4fd58e3ace43 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.9</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.10</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">March 05, 2018</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">March 14, 2018</td> </tr> </tbody> </table> @@ -3386,7 +3386,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-03-05 18:31 UTC. +Generated on: 2018-03-14 18:27 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 c91ff7c0892784e3f706f5601b6af4da786200b9..0d183a9dfb0230ed96a08fa421504379f2b1874f 100755 --- a/generateDS.py +++ b/generateDS.py @@ -232,7 +232,7 @@ logging.disable(logging.INFO) # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.29.9' +VERSION = '2.29.10' ##VERSION## BaseStrTypes = six.string_types @@ -1623,7 +1623,7 @@ class XschemaHandler(handler.ContentHandler): self.inNonanonymousComplexType = 1 element = XschemaElement(attrs, Targetnamespace) fqn = element.getFullyQualifiedName() - if fqn: + if fqn and name == ComplexTypeType: fqnToElementDict[fqn] = element if element.prefix in prefixToNamespaceMap: element.namespace = prefixToNamespaceMap[element.prefix] diff --git a/generateDS.txt b/generateDS.txt index 8630a4941dacf2cbaef16365edeb946b6dab4039..7f7d31111850e42f97d77b0d38ebcd0ac9407fc3 100644 --- a/generateDS.txt +++ b/generateDS.txt @@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema .. version -:revision: 2.29.9 +:revision: 2.29.10 .. version diff --git a/generateds_gui_notes.html b/generateds_gui_notes.html index 8ebf3ae936d5379ca674ee5f66f89442953d0c81..7432d82f614b1535d014f7b481a858d12470ae69 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.9</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.10</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">March 05, 2018</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">March 14, 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-03-05 18:31 UTC. +Generated on: 2018-03-14 18:27 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 196021d68554208ff84c40ead5ecf98b167b51bf..f8efa786c4c3f1840ed6b38c812f069068353fd6 100644 --- a/generateds_gui_notes.txt +++ b/generateds_gui_notes.txt @@ -12,7 +12,7 @@ GenerateDS GUI Notes .. version -:revision: 2.29.9 +:revision: 2.29.10 .. version diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py index 506b86ccdc3392cfe52c8505a80a0d221b4ee597..1a34eb2a12c5a981c31ce333267d83ffd9aea54c 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.9' +VERSION = '2.29.10' ##VERSION## diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html index 7987a7ad9177d72cdb600511314c217cfebcc3bb..a5724e3f4920b55203bf0bc492e21317f1096df9 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.9</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.10</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">March 05, 2018</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">March 14, 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-03-05 18:31 UTC. +Generated on: 2018-03-14 18:27 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 9bcc9a5b604be6df48da2962d8d401be7550f03f..72b3f8bd825a85d705605086605d30d38bc50aae 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.9 +:revision: 2.29.10 .. version diff --git a/process_includes.py b/process_includes.py index 269803e7fc76b36459dbcafb817596780f29f017..abbc7daccdc695df74da28806345a90ae9829af6 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.9' +VERSION = '2.29.10' ##VERSION## CatalogDict = {} diff --git a/setup.py b/setup.py index b4da499aad12bdc91632bdd51f61b5d8862d9d66..ef25b06fdfd9b3e06b1aecd429704d69f08ba6da 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.29.9", + version="2.29.10", ##VERSION## author="Dave Kuhlman", author_email="dkuhlman@davekuhlman.org", diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html index 5a3c030ee30357b0391c349ef5864d963d02ecbc..4b83f308a40e6ebea72592190e992cca031a3051 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.9</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.10</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">March 05, 2018</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">March 14, 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-03-05 18:31 UTC. +Generated on: 2018-03-14 18:27 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 78530e0b37732e1ad0c71a39e31ac771531c8ed7..e89fa7e49ccc08eb347308acbcaa1e0bf5136329 100644 --- a/tutorial/generateds_tutorial.txt +++ b/tutorial/generateds_tutorial.txt @@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial .. version -:revision: 2.29.9 +:revision: 2.29.10 .. version diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip index bd7a160b473d2e58c02438d7e605855e9ca38239..febd5dad5775f685cfc1d863691555447c06084d 100644 Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ