summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2016-10-10 15:20:26 -0700
committerDylan Baker <dylan@pnwbakers.com>2016-10-24 11:12:38 -0700
commit6c8ddc3b8615f7f9da3b8c9ec1b59f87ac63050d (patch)
tree043b2c05b27be6be8282d75d09ca57fc5279c084 /framework
parent37e58e583e791f8cbfefc34d6142720b0ef3fbf1 (diff)
framework/backends/json: replace str() with six.text_type()
since str() is incorrect in python2.x. This also fixes an indentation error. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/backends/json.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/backends/json.py b/framework/backends/json.py
index f279f2fb6..cf7f11998 100644
--- a/framework/backends/json.py
+++ b/framework/backends/json.py
@@ -279,7 +279,7 @@ def _load(results_file):
raise exceptions.PiglitFatalError(
'While loading json results file: "{}",\n'
'the following error occurred:\n{}'.format(results_file.name,
- str(e)))
+ six.text_type(e)))
if isinstance(result, results.TestrunResult):
return result