From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 20 Mar 2017 08:42:55 +0000 (+0100)
Subject: Changed ErrorClass in parsing of json files in pp_lib/cfg_app.py
X-Git-Tag: 0.1.2~251
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=10b0bd0684704942c443913b7fccc2d46ca04833;p=pixelpark%2Fadmin-tools.git

Changed ErrorClass in parsing of json files in pp_lib/cfg_app.py
---

diff --git a/pp_lib/cfg_app.py b/pp_lib/cfg_app.py
index 08cfea4..af43199 100644
--- a/pp_lib/cfg_app.py
+++ b/pp_lib/cfg_app.py
@@ -20,8 +20,6 @@ import textwrap
 import datetime
 import json
 
-from json import JSONDecodeError
-
 # Third party modules
 import six
 
@@ -43,7 +41,7 @@ from .merge import merge_structure
 
 from .app import PpApplication
 
-__version__ = '0.4.2'
+__version__ = '0.4.3'
 LOG = logging.getLogger(__name__)
 
 
@@ -322,7 +320,7 @@ class PpConfigApplication(PpApplication):
             with open(cfg_file, 'r', **open_opts) as fh:
                 try:
                     log_cfg = json.load(fh)
-                except JSONDecodeError as e:
+                except (ValueError, TypeError) as e:
                     msg = "Wrong file {!r} - ".format(cfg_file) + str(e)
                     self.handle_error(msg, e.__class__.__name__)
                     continue