From fe7850ec78cb2ecbf1a2a2afa2e5c3feb5e62351 Mon Sep 17 00:00:00 2001 From: Eric Hurst Date: Thu, 29 Aug 2019 09:30:49 -0600 Subject: Add python 2/3 compatablity for configparser --- eventmq/tests/test_utils.py | 11 ++++++++++- eventmq/utils/settings.py | 9 ++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/eventmq/tests/test_utils.py b/eventmq/tests/test_utils.py index 2937085..501b081 100644 --- a/eventmq/tests/test_utils.py +++ b/eventmq/tests/test_utils.py @@ -12,7 +12,16 @@ # # You should have received a copy of the GNU Lesser General Public License # along with eventmq. If not, see . -from configparser import ConfigParser + +# + +# ConfigParser was renamed to configparser in python 3. Do this try...except +# to maintain python 2/3 compatability +try: + from configparser import ConfigParser +except ImportError: + import ConfigParser + from imp import reload import io import os diff --git a/eventmq/utils/settings.py b/eventmq/utils/settings.py index 7a91858..ade76c2 100644 --- a/eventmq/utils/settings.py +++ b/eventmq/utils/settings.py @@ -16,7 +16,14 @@ :mod:`settings` -- Settings Utilities ===================================== """ -from configparser import ConfigParser, NoOptionError + +# ConfigParser was renamed to configparser in python 3. Do this try...except +# to maintain python 2/3 compatability +try: + from configparser import ConfigParser, NoOptionError +except ImportError: + from ConfigParser import ConfigParser, NoOptionError + import json import logging import os -- cgit v1.2.1 From 1dc6bb3c691bf4698606d5803e6e208d5b1cfddd Mon Sep 17 00:00:00 2001 From: Eric Hurst Date: Thu, 29 Aug 2019 10:36:48 -0600 Subject: Version Bump 0.3.10 --- eventmq/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventmq/__init__.py b/eventmq/__init__.py index 018a540..1515f24 100644 --- a/eventmq/__init__.py +++ b/eventmq/__init__.py @@ -1,5 +1,5 @@ __author__ = 'EventMQ Contributors' -__version__ = '0.3.10-rc1' +__version__ = '0.3.10' PROTOCOL_VERSION = 'eMQP/1.0' -- cgit v1.2.1