Commit b0c56c9f authored by Dave Kuhlman's avatar Dave Kuhlman

v. 2.29.22 Fix to XschemaAttribute ctor (XML schema prefix)

parent d73539b7
......@@ -141,6 +141,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
Version 2.29.22 (08/03/2018)
- Fixed exception that occurs when (1) an xs:complexType is defined
with an attribute and a child that have the same name and (2) the
"-a" command line flag is used to specify a schema namespace
prefix other than the default (e.g. generateDS.py -a "xsd:" ...).
Thanks to Daniel Ramirez for tracking down and analyzing this
issue.
Version 2.29.21 (08/02/2018)
- Fix to use of simpleType name. Needed to do cleanupName() on the
......
......@@ -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.21</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.22</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 02, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">August 03, 2018</td>
</tr>
</tbody>
</table>
......@@ -3392,7 +3392,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-02 19:16 UTC.
Generated on: 2018-08-03 21:41 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>
......
......@@ -227,7 +227,7 @@ _log = logging.getLogger(__name__)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.21'
VERSION = '2.29.22'
##VERSION##
BaseStrTypes = six.string_types
......@@ -442,6 +442,8 @@ def set_type_constants(nameSpace):
IDTypes = (IDREFSType, IDREFType, IDType, )
SchemaType = nameSpace + 'schema'
SequenceType = nameSpace + 'sequence'
# The firist item in this tuple is special.
# It's the primary string type and must stay in the first position.
StringType = (
nameSpace + 'string',
nameSpace + 'duration',
......@@ -1440,12 +1442,15 @@ class XschemaAttribute:
def __init__(
self,
name,
data_type='xs:string',
data_type=None,
use='optional',
default=None,
fixed=None):
self.name = name
self.data_type = data_type
if data_type is None:
self.data_type = StringType[0]
else:
self.data_type = data_type
self.use = use
self.default = default
# treat `fixed` the same as `default`.
......
......@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
:revision: 2.29.21
:revision: 2.29.22
.. 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.21</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.22</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 02, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">August 03, 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-02 19:16 UTC.
Generated on: 2018-08-03 21:41 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.21
:revision: 2.29.22
.. 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.21'
VERSION = '2.29.22'
##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.21</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.22</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 02, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">August 03, 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-02 19:16 UTC.
Generated on: 2018-08-03 21:41 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.21
:revision: 2.29.22
.. version
......
......@@ -40,7 +40,7 @@ except ImportError:
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.21'
VERSION = '2.29.22'
##VERSION##
CatalogDict = {}
......
......@@ -8,7 +8,7 @@ setup(
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
version="2.29.21",
version="2.29.22",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
......
......@@ -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.21</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.22</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 02, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">August 03, 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-02 19:16 UTC.
Generated on: 2018-08-03 21:41 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>
......
......@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
:revision: 2.29.21
:revision: 2.29.22
.. version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment