Skip to content
This repository has been archived by the owner on Oct 28, 2019. It is now read-only.

Commit

Permalink
removed JSONDecodeError import to enable Python 3.4 compatibility for…
Browse files Browse the repository at this point in the history
… blue agent
  • Loading branch information
Gnork committed May 11, 2019
1 parent b8c2fdd commit f38c20d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions cc_core/agent/blue/__main__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import distutils
import glob
import hashlib
import os
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cc_core/version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RED_VERSION = '7'
CC_VERSION = '0'
PACKAGE_VERSION = '1'
PACKAGE_VERSION = '2'

VERSION = '{}.{}.{}'.format(RED_VERSION, CC_VERSION, PACKAGE_VERSION)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "cc-core"
version = "7.0.1"
version = "7.0.2"
authors = ["Christoph Jansen <Christoph.Jansen@htw-berlin.de>", "Bruno Schilling <Bruno.Schilling@student.htw-berlin.de>"]
license = "AGPL-3.0"
readme = "README.md"
Expand Down

0 comments on commit f38c20d

Please sign in to comment.