diff --git a/README b/README index 0cbb735b7cb2b672355a09c9b98fa84656f8f00f..2c7f27b26cf0c0719b8edb7f0a858ca1f73406ef 100644 --- a/README +++ b/README @@ -141,6 +141,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Change history -------------- +Version 2.19c (02/25/2016) + +- Another patch for Python 2 and 3. We needed to protect against + performing an encoding that caused an exception in generateDS.py + and process_includes.py. Thanks to Marcus Schäfer for catching + this and for providing a fix. + Version 2.19b (02/16/2016) - Modified generated code so that it will run under both Python 2 diff --git a/generateDS.py b/generateDS.py index 70755e7b37bb19af93fe95a1650583f9849e0bf9..6ba42bf31884d7db5f280695e091d47fde199761 100755 --- a/generateDS.py +++ b/generateDS.py @@ -202,7 +202,7 @@ logging.disable(logging.INFO) # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.19b' +VERSION = '2.19c' ##VERSION## if sys.version_info.major == 2: diff --git a/generateDS.txt b/generateDS.txt index d494381c30e5cf375ee79ef0677a06b5dbbb53cb..2a820d50f41429973d01319b76a47c6d7f811dcb 100644 --- a/generateDS.txt +++ b/generateDS.txt @@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema .. version -:revision: 2.19b +:revision: 2.19c .. version diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py index 077b8508a19f3f84914e3f89c8f37257d223dcf7..87693faabae2d25ea0af0508771c271efdf37089 100755 --- a/gui/generateds_gui.py +++ b/gui/generateds_gui.py @@ -31,7 +31,7 @@ from libgenerateDS.gui import generateds_gui_session # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.19b' +VERSION = '2.19c' ##VERSION## diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt index 5e68685b559c4bc4dec1e78f94033ef41d94614b..f7195fcfa36eff73042c920324773827ced34abd 100644 --- a/librarytemplate_howto.txt +++ b/librarytemplate_howto.txt @@ -8,7 +8,7 @@ How to package a generateDS.py generated library .. version -:revision: 2.19b +:revision: 2.19c .. version diff --git a/process_includes.py b/process_includes.py index ed91e2bf21e7bf0340ac01c81781a0180d39e848..8293fd491d89597886ac92bbc5e1b8212c43b3a9 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.19b' +VERSION = '2.19c' ##VERSION## CatalogDict = {} diff --git a/setup.py b/setup.py index 0f8dbf9f2c612d6f7eaeee915b70dcea2823277b..cb8b843f2db57fd672a223098c275b59f1537873 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.19b", + version="2.19c", ##VERSION## author="Dave Kuhlman", author_email="dkuhlman@davekuhlman.org", diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt index b0e54893b6596b0ee83372fe4b8f3090e9d202b9..6aa62039cf489af121e898967d72d3b63683ae3e 100644 --- a/tutorial/generateds_tutorial.txt +++ b/tutorial/generateds_tutorial.txt @@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial .. version -:revision: 2.19b +:revision: 2.19c .. version