Update Tools

Updates to latet tools and corrects non-pep8
compliance

Change-Id: Ic1dd8e8ee9d3ac5360e53ed3578d631f4da28161
Signed-off-by: mbeierl <mark.beierl@dell.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/docker/storperf-master/storperf/db/job_db.py b/docker/storperf-master/storperf/db/job_db.py
index eb35cac..b029a35 100644
--- a/docker/storperf-master/storperf/db/job_db.py
+++ b/docker/storperf-master/storperf/db/job_db.py
@@ -265,7 +265,7 @@ class JobDB(object):
                     break
                 try:
                     data = json.loads(row[1])
-                except:
+                except Exception:
                     data = row[1]
                 params[row[0]] = data
             db.close()
diff --git a/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py b/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py
index 523ff77..6043f10 100644
--- a/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py
+++ b/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py
@@ -7,10 +7,11 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-from storperf.carbon.converter import Converter
 import json
 import unittest
 
+from storperf.carbon.converter import Converter
+
 
 class JSONToCarbonTest(unittest.TestCase):
 
@@ -112,5 +113,6 @@ class JSONToCarbonTest(unittest.TestCase):
             "value", result["list_with_spaces.1.key"],
             result["list_with_spaces.1.key"])
 
+
 if __name__ == '__main__':
     unittest.main()