more unicode cleanup post py27

1 files changed, 3 insertions, 10 deletions

diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py
index 6beed24..f29449f 100644
--- a/testing/framework/TestCmd.py
+++ b/testing/framework/TestCmd.py
@@ -358,14 +358,8 @@ def to_str(s):
     return str(s, 'utf-8')
 
 
-try:
-    eval('unicode')
-except NameError:
-    def is_String(e):
-        return isinstance(e, (str, UserString))
-else:
-    def is_String(e):
-        return isinstance(e, (str, unicode, UserString))
+def is_String(e):
+    return isinstance(e, (str, UserString))
 
 testprefix = 'testcmd.'
 if os.name in ('posix', 'nt'):
@@ -1094,7 +1088,7 @@ class TestCmd(object):
             condition = self.condition
         if self._preserve[condition]:
             for dir in self._dirlist:
-                print(u"Preserved directory " + dir)
+                print("Preserved directory " + dir)
         else:
             list = self._dirlist[:]
             list.reverse()
@@ -1536,7 +1530,6 @@ class TestCmd(object):
 
         return stream
 
-
     def finish(self, popen=None, **kw):
         """
         Finishes and waits for the process being run under control of