http://scons.tigris.org/issues/show_bug.cgi?id=2345

[scons.git] / src / engine / SCons / compat / _scons_UserString.py

diff --git a/src/engine/SCons/compat/_scons_UserString.py b/src/engine/SCons/compat/_scons_UserString.py
index dfc2b3037ab7dbe8d14142f791806c1dac28039c..59be10b8ce645505d4467206c70aacaaf62d6dca 100644 (file)
--- a/src/engine/SCons/compat/_scons_UserString.py
+++ b/src/engine/SCons/compat/_scons_UserString.py
@@ -36,7 +36,7 @@ in later versions.
 try: unicode
 except NameError:
     def is_String(obj):
-        return type(obj) is str
+        return isinstance(obj, str)
 else:
     def is_String(obj):
         return type(obj) in (str, unicode)
@@ -57,9 +57,9 @@ class UserString:
     def __complex__(self): return complex(self.data)
     def __hash__(self): return hash(self.data)
 
-    def __cmp__(self, string):
+    def __cmp__(self, str):
         if isinstance(string, UserString):
-            return cmp(self.data, string.data)
+            return cmp(self.data, str.data)
         else:
             return cmp(self.data, string)
     def __contains__(self, char):