diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 11:06:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 11:06:59 +0000 |
commit | 436eb38774b3b63465105e4e25a421d4b2887769 (patch) | |
tree | a7d65d59a2e325231d9df22f92a06cfcad005a4a /tools | |
parent | 6606baf5049772f82e14457cddaac656b878eb08 (diff) | |
parent | da2dc0afac6dd2acd498f4c650669af08fb179dd (diff) | |
download | trove-436eb38774b3b63465105e4e25a421d4b2887769.tar.gz |
Merge "when pylint has an error loading the config, it should fail"
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/trove-pylint.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tools/trove-pylint.py b/tools/trove-pylint.py index c2d7f3dc..a31d9db9 100755 --- a/tools/trove-pylint.py +++ b/tools/trove-pylint.py @@ -79,16 +79,8 @@ class Config(object): indent=2, separators=(',', ': ')) def load(self, filename=DEFAULT_CONFIG_FILE): - self.config = self.default_config - - try: - with open(filename) as fp: - _c = json.load(fp, encoding="utf-8") - - self.config = _c - except Exception: - print("An error occured loading configuration, using default.") - return self + with open(filename) as fp: + self.config = json.load(fp, encoding="utf-8") def get(self, attribute): return self.config[attribute] |