From a5fcda35002cd444483031f6fef5e160f8a74201 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 19 Jul 2017 16:03:22 +0100
Subject: [PATCH] Reviews
---
force_bdss/core_mco_driver.py | 7 ++-----
force_bdss/workspecs/workflow.py | 8 ++++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/force_bdss/core_mco_driver.py b/force_bdss/core_mco_driver.py
index 1407602..f84c83d 100644
--- a/force_bdss/core_mco_driver.py
+++ b/force_bdss/core_mco_driver.py
@@ -6,7 +6,7 @@ from traits.api import on_trait_change
from force_bdss.base_core_driver import BaseCoreDriver
from force_bdss.workspecs.workflow import (InvalidVersionException,
- CorruptedInputFile)
+ InvalidFileException)
class CoreMCODriver(BaseCoreDriver):
@@ -18,10 +18,7 @@ class CoreMCODriver(BaseCoreDriver):
def application_started(self):
try:
workflow = self.application.workflow
- except InvalidVersionException as e:
- print(str(e), file=sys.stderr)
- sys.exit(1)
- except CorruptedInputFile as e:
+ except (InvalidVersionException, InvalidFileException) as e:
print(str(e), file=sys.stderr)
sys.exit(1)
diff --git a/force_bdss/workspecs/workflow.py b/force_bdss/workspecs/workflow.py
index e49a81e..edc85c8 100644
--- a/force_bdss/workspecs/workflow.py
+++ b/force_bdss/workspecs/workflow.py
@@ -7,11 +7,11 @@ from .multi_criteria_optimizer import MultiCriteriaOptimizer
SUPPORTED_FILE_VERSIONS = ["1"]
-class InvalidVersionException(Exception):
+class InvalidFileException(Exception):
pass
-class CorruptedInputFile(Exception):
+class InvalidVersionException(InvalidFileException):
pass
@@ -26,8 +26,8 @@ class Workflow(HasStrictTraits):
try:
version = json_data["version"]
except KeyError:
- raise CorruptedInputFile("Corrupted input file, no version"
- " specified")
+ raise InvalidFileException("Corrupted input file, no version"
+ " specified")
if version not in SUPPORTED_FILE_VERSIONS:
raise InvalidVersionException(
--
GitLab