Updating to_str and to_bytes between QMTest and SCons.Util.

-Added check to skip decode if already string; otherwise, throws TypeError.

1 files changed, 3 insertions, 6 deletions

diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index d7b8d942..bff0d6aa 100644
--- a/QMTest/TestCmd.py
+++ b/QMTest/TestCmd.py
@@ -339,15 +339,12 @@ def is_List(e):
 def to_bytes (s):
     if isinstance (s, bytes) or bytes is str:
         return s
-    else:
-        return bytes (s, 'utf-8')
+    return bytes (s, 'utf-8')
 
 def to_str (s):
-    if bytes is str:
+    if bytes is str or is_String(s):
         return s
-    elif not is_String(s):
-        return str (s, 'utf-8')
-    return s
+    return str (s, 'utf-8')
 
 try:
     eval('unicode')