Commit 6d4930f8 authored by Dave Kuhlman's avatar Dave Kuhlman

v. 2.29.15 -- Fixed exception related to --preserve-cdata-tags

parent 5ef49df3
......@@ -141,6 +141,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
Version 2.29.15 (05/16/2018)
- Fixed issue related to use of command line flag
--preserve-cdata-tags: when the generated regex pattern was not
matched (returned None), created an exception. Added a test for
None. Also, required conversion of bytes to str before the
pattern match for Python 3. Thanks to Lavanya Poondru for
reporting this and helping with a fix.
Version 2.29.14 (05/08/2018)
- Fixes to logging in generateDS.py -- (1) Setup logging only when
......
......@@ -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.14</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.15</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">May 09, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">May 16, 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-05-09 18:10 UTC.
Generated on: 2018-05-16 18:03 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>
......
......@@ -225,7 +225,7 @@ _log = logging.getLogger(__name__)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.14'
VERSION = '2.29.15'
##VERSION##
BaseStrTypes = six.string_types
......@@ -3640,8 +3640,11 @@ def generateBuildStandard_1(
wrt(" %s nodeName_ == '%s':\n" % (keyword, origName, ))
if PreserveCdataTags:
wrt(" mo_ = PRESERVE_CDATA_TAGS_PAT.search("
"etree_.tostring(child_).strip())\n")
wrt(" %s_ = mo_.group(1)\n" % name)
"etree_.tostring(child_).strip().decode())\n")
wrt(" if mo_ is None:\n")
wrt(" %s_ = ''\n" % name)
wrt(" else:\n")
wrt(" %s_ = mo_.group(1)\n" % name)
else:
wrt(" %s_ = child_.text\n" % name)
if childType == TokenType:
......
......@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
:revision: 2.29.14
:revision: 2.29.15
.. 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.14</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.15</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">May 09, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">May 16, 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-05-09 18:10 UTC.
Generated on: 2018-05-16 18:03 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.14
:revision: 2.29.15
.. 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.14'
VERSION = '2.29.15'
##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.14</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.15</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">May 09, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">May 16, 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-05-09 18:10 UTC.
Generated on: 2018-05-16 18:03 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.14
:revision: 2.29.15
.. version
......
......@@ -40,7 +40,7 @@ except ImportError:
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.14'
VERSION = '2.29.15'
##VERSION##
CatalogDict = {}
......
......@@ -7,7 +7,7 @@ setup(name="generateDS",
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
version="2.29.14",
version="2.29.15",
##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.14</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.15</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">May 09, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">May 16, 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-05-09 18:10 UTC.
Generated on: 2018-05-16 18:03 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.14
:revision: 2.29.15
.. 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