diff --git a/MANIFEST.in b/MANIFEST.in
index dfc4c645665f59ed1fe072095cf4de47d10c2359..268eaddedc0f4bda16cd333a4b5775447c7770f1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -98,6 +98,29 @@ include tests/to_etree.xsd tests/to_etree.xml
include tests/to_etree1.xml tests/to_etree2.xml
include tests/to_etree1_sub.py tests/to_etree1_sup.py
include tests/to_etree2_sub.py tests/to_etree2_sup.py
+include tests/defaults_cases1_out.xml tests/defaults_cases.xsd
+include tests/defaults_cases1_sub.py tests/defaults_coverage1_sub.py
+include tests/defaults_cases1_sup.py tests/defaults_coverage1_sup.py
+include tests/defaults_cases.xml tests/defaults_coverage.xsd
+include tests/address.xsd
+include tests/cdata1_sub.py tests/cdata1_sup.py
+include tests/cdata1.xml tests/cdata.xsd
+include tests/cleanupname1_sub.py tests/cleanupname1_sup.py
+include tests/cleanupname.xsd
+include tests/groups.xml tests/groups.xsd
+include tests/mapcleanname1_sub.py tests/mapcleanname1_sup.py
+include tests/mapcleanname.xsd
+include tests/nested_def1_out.xml
+include tests/nested_def.xml tests/nested_def.xsd
+include tests/nested_def1_sub.py tests/nested_def1_sup.py
+include tests/prefix_classname1_out.xml
+include tests/prefix_classname1_sub.py tests/prefix_classname1_sup.py
+include tests/prefix_classname.xml tests/prefix_classname.xsd
+include tests/validate_simpletypes1_out.xml
+include tests/validate_simpletypes1_sub.py tests/validate_simpletypes1_sup.py
+include tests/validate_simpletypes1_warnings.txt
+include tests/validate_simpletypes2_sub.py tests/validate_simpletypes2_sup.py
+include tests/validate_simpletypes.xml tests/validate_simpletypes.xsd
include gui/generateds_gui.py
include gui/generateds_gui.glade
diff --git a/README b/README
index 9b748fbd6592d51567b9a207e0147c62844d18bd..4a75614b7611c4b8c041135672006127d1737c3b 100644
--- a/README
+++ b/README
@@ -141,6 +141,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.23b (09/26/2016)
+
+- Added missing unit test files to build (MANIFEST.in).
+- Fixed exception that occurs when character content is empty for an
+ element defined as type xs:token. Thanks to Andrii Iudin for
+ reporting and checking this.
+
Version 2.23a (09/14/2016)
- Integrated Clayton Daley's fixes to the unit tests. Thanks much,
diff --git a/generateDS.html b/generateDS.html
index dde039ca9c0576a968e4817344f52c3c3d09d953..0f81b96c37c9a06d4b122ef44fe0ee8ff452a75a 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.23a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.23b</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">September 14, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">September 18, 2016</td>
</tr>
</tbody>
</table>
@@ -3180,7 +3180,7 @@ following among others:</p>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateDS.txt">View document source</a>.
-Generated on: 2016-09-14 18:26 UTC.
+Generated on: 2016-09-18 21:16 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 d4091bbfc482c2ca23e3b4a54499c25b3eeee9db..06592a9e34156f7f6c949d8a6d4f81f593012a35 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -204,7 +204,7 @@ logging.disable(logging.INFO)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.23a'
+VERSION = '2.23b'
##VERSION##
if sys.version_info.major == 2:
@@ -3590,8 +3590,11 @@ def generateBuildStandard_1(
else:
wrt(" %s_ = child_.text\n" % name)
if childType == TokenType:
- wrt(' %s_ = re_.sub('
+ wrt(' if %s_:\n' % (name, ))
+ wrt(' %s_ = re_.sub('
'String_cleanup_pat_, " ", %s_).strip()\n' % (name, name))
+ wrt(' else:\n')
+ wrt(' %s_ = ""\n' % (name, ))
if child.isListType():
if (childType in IntegerType or
childType == PositiveIntegerType or
diff --git a/generateDS.txt b/generateDS.txt
index 3230e02b1f1dcd02b39aedbd7f2a958200b36c30..038644cd4d915c39f5cc3c871fa9be52dad34027 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
-:revision: 2.23a
+:revision: 2.23b
.. version
diff --git a/generateds_gui_notes.html b/generateds_gui_notes.html
index 8196a0d5c7fde99d33a3d04b627a7215bcf21536..093afafed7a72ea86e8e98c72e6cf86d3346f111 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.23a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.23b</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">September 14, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">September 18, 2016</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: 2016-09-14 18:26 UTC.
+Generated on: 2016-09-18 21:16 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 bfcd9449b9532c819ea739fb0992fc5e196d919f..4657f6bdb8c880f8422d9cd8deb3906ef0baddcf 100644
--- a/generateds_gui_notes.txt
+++ b/generateds_gui_notes.txt
@@ -12,7 +12,7 @@ GenerateDS GUI Notes
.. version
-:revision: 2.23a
+:revision: 2.23b
.. version
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index 21f2b10ed897dbd269cfd5be86dce6829c3efef5..719c34218aa6e4f98e9f6e55f18be43ed54ed753 100755
--- 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.23a'
+VERSION = '2.23b'
##VERSION##
diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html
index 8d2313ff96aabe92e050e32d48ff139787b9472e..fc866fbad64914ddbcec37941cdcd0a54b4a20bb 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.23a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.23b</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">September 14, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">September 18, 2016</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: 2016-09-14 18:26 UTC.
+Generated on: 2016-09-18 21:16 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 7c62ef2aa1c023d3c8be6e6989cc34c519208642..ece626647a5702e47ba7f606c3ef132ad24273f0 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
-:revision: 2.23a
+:revision: 2.23b
.. version
diff --git a/process_includes.py b/process_includes.py
index 1745adca768e9694fcebc3b4c67a4fe2bd0b338e..be1da8d8aa44ae8ac99810cbf9229370ab93bae7 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.23a'
+VERSION = '2.23b'
##VERSION##
CatalogDict = {}
diff --git a/setup.py b/setup.py
index 9ade05226f25a5f2be2d59562544cb3bf5620561..8a5f0b87295eb4616d894181fc4fef714b722446 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.23a",
+ version="2.23b",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html
index 95260f7aa6435b93f2ef89aea15bdf6f1eb72464..d334cc5e1e73cbd76e4db7434eaced58bc6d5f3a 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.23a</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.23b</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">September 14, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">September 18, 2016</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: 2016-09-14 18:26 UTC.
+Generated on: 2016-09-18 21:16 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 b8c51a102bfcbcb6a5de12444e9e015dfa446ce8..b29a4b5b18d92592b0d1e955d3e37c4f56b2f66d 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
-:revision: 2.23a
+:revision: 2.23b
.. version
diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip
index f04f23a34a619a12fb46d87854fc0a8f89142bff..2689b1254460869a9a4730b51de2873493f43129 100644
Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ