python: use six unicode/bytes/str handling

This is not feature complete for python 3.x in and of itself, but it
gets started by using six functions rather than str and unicode.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/framework/exceptions.py b/framework/exceptions.py
index e0b04d6b7..566372fc8 100644
--- a/framework/exceptions.py
+++ b/framework/exceptions.py
@@ -24,6 +24,8 @@ from __future__ import print_function, absolute_import, division
 import sys
 import functools
 
+import six
+
 __all__ = [
     'PiglitInternalError',
     'PiglitFatalError',
@@ -52,6 +54,7 @@ def handler(func):
     return _inner
 
 
+@six.python_2_unicode_compatible
 class PiglitException(Exception):
     """Class for non-error exceptions.
 
@@ -60,10 +63,11 @@ class PiglitException(Exception):
 
     """
     def __str__(self):
-        return ('An internal exception that should have been handled was not:'
+        return (u'An internal exception that should have been handled was not:'
                 '\n{}'.format(super(PiglitException, self).__str__()))
 
 
+@six.python_2_unicode_compatible
 class PiglitInternalError(Exception):
     """Class for errors in piglit.
 
@@ -71,7 +75,7 @@ class PiglitInternalError(Exception):
 
     """
     def __str__(self):
-        return 'An internal error occured:\n{}'.format(
+        return u'An internal error occured:\n{}'.format(
             super(PiglitInternalError, self).__str__())