From f38c20deec1473bb9391d3334ee844a3bbf15d78 Mon Sep 17 00:00:00 2001 From: Christoph Jansen Date: Sat, 11 May 2019 11:08:38 +0200 Subject: [PATCH] removed JSONDecodeError import to enable Python 3.4 compatibility for blue agent --- cc_core/agent/blue/__main__.py | 4 +--- cc_core/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cc_core/agent/blue/__main__.py b/cc_core/agent/blue/__main__.py index 260d88d..d777382 100644 --- a/cc_core/agent/blue/__main__.py +++ b/cc_core/agent/blue/__main__.py @@ -1,4 +1,3 @@ -import distutils import glob import hashlib import os @@ -13,7 +12,6 @@ import urllib.request from argparse import ArgumentParser -from json import JSONDecodeError from traceback import format_exc from urllib.error import URLError from urllib.parse import urlparse @@ -157,7 +155,7 @@ def get_blue_data(blue_location): with open(blue_location, 'r') as blue_file: try: return json.load(blue_file) - except JSONDecodeError as e: + except Exception as e: raise ExecutionError('Could not decode blue file "{}". Blue file is not in json format.\n{}' .format(blue_location, str(e))) except FileNotFoundError as file_error: diff --git a/cc_core/version.py b/cc_core/version.py index b702bd6..819076d 100644 --- a/cc_core/version.py +++ b/cc_core/version.py @@ -1,5 +1,5 @@ RED_VERSION = '7' CC_VERSION = '0' -PACKAGE_VERSION = '1' +PACKAGE_VERSION = '2' VERSION = '{}.{}.{}'.format(RED_VERSION, CC_VERSION, PACKAGE_VERSION) diff --git a/pyproject.toml b/pyproject.toml index b9ac650..41db0e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cc-core" -version = "7.0.1" +version = "7.0.2" authors = ["Christoph Jansen ", "Bruno Schilling "] license = "AGPL-3.0" readme = "README.md"