Unicode byte decode fixes

Added better handling for decoding bytes to unicode strings in the ustr()
function. This fixed the test_stdin_file integration in python 3.6.

Also fixed a python 2.6 linting issue.

1 files changed, 5 insertions, 2 deletions

diff --git a/qa/base.py b/qa/base.py
index c36e69b..acab657 100644
--- a/qa/base.py
+++ b/qa/base.py
@@ -16,12 +16,15 @@ def ustr(obj):
     if sys.version_info[0] == 2:
         # If we are getting a string, then do an explicit decode
         # else, just call the unicode method of the object
-        if type(obj) in [str, basestring]:  # pragma: no cover # noqa # pylint: disable=unidiomatic-typecheck
+        if type(obj) in [str, basestring]:  # pragma: no cover # noqa
             return unicode(obj, DEFAULT_ENCODING)  # pragma: no cover # noqa
         else:
             return unicode(obj)  # pragma: no cover # noqa
     else:
-        return str(obj)
+        if type(obj) in [bytes]:
+            return obj.decode(DEFAULT_ENCODING)
+        else:
+            return str(obj)
 
 
 class BaseTestCase(TestCase):