From f488c6ad6b527327eeb553f8d73b56798b5e0988 Mon Sep 17 00:00:00 2001 From: Dave Kuhlman <dkuhlman@davekuhlman.org> Date: Thu, 25 Feb 2016 16:31:59 -0800 Subject: [PATCH] Update version number and README for encoding fix --- README | 7 +++++++ generateDS.py | 2 +- generateDS.txt | 2 +- gui/generateds_gui.py | 2 +- librarytemplate_howto.txt | 2 +- process_includes.py | 2 +- setup.py | 2 +- tutorial/generateds_tutorial.txt | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README b/README index 0cbb735..2c7f27b 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 70755e7..6ba42bf 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 d494381..2a820d5 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 077b850..87693fa 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 5e68685..f7195fc 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 ed91e2b..8293fd4 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 0f8dbf9..cb8b843 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 b0e5489..6aa6203 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 -- GitLab