[10/15] zookeeper git commit: Attempt to please apache jenkins which does not simple json module..

[ph...@apache.org]

Attempt to please apache jenkins which does not simple json module..


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/088072f7
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/088072f7
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/088072f7

Branch: refs/heads/jenkins-tools
Commit: 088072f78828c32fabb1ea60fdcf9812a2ed1145
Parents: e4d226d
Author: Michael Han <ha...@apache.org>
Authored: Thu May 18 11:29:41 2017 -0700
Committer: Michael Han <ha...@apache.org>
Committed: Thu May 18 11:29:41 2017 -0700

----------------------------------------------------------------------
 zk-test-report/zk_test_analyzer.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/088072f7/zk-test-report/zk_test_analyzer.py
----------------------------------------------------------------------
diff --git a/zk-test-report/zk_test_analyzer.py b/zk-test-report/zk_test_analyzer.py
index f7a4535..2c9acc7 100644
--- a/zk-test-report/zk_test_analyzer.py
+++ b/zk-test-report/zk_test_analyzer.py
@@ -30,7 +30,6 @@ import time
 import re
 import requests
 from jinja2 import Template
-from simplejson import JSONDecodeError
 
 # If any of these strings appear in the console output, it's a build one should probably ignore
 # for analyzing failed/hanging tests.
@@ -97,7 +96,7 @@ def generate_report(build_url):
     LOG.info("Analyzing %s", build_url)
     try:
         response = requests.get(build_url + "/api/json").json()
-    except JSONDecodeError:
+    except:
         LOG.error("failed to get: " + build_url + "/api/json")
         return
     if response["building"]:
@@ -136,7 +135,7 @@ def parse_cli_args(cli_args):
             excluded_builds = [int(x) for x in excluded_builds_arg[i].split(",")]
         try:    
             response = requests.get(job_url + "/api/json").json()
-        except JSONDecodeError:
+        except:
             LOG.error("failed to get: " + job_url + "/api/json")
             continue
         if "activeConfigurations" in response: