diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-03-29 05:50:15 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-03-29 05:50:15 (GMT) |
| commit | 7adebb06bb6055345cc584377159d8052ea39e1b (patch) | |
| tree | d0ca5f58b87d964927a1db7f4fe8a602f8405d23 /src/engine/SCons/compat/_scons_UserString.py | |
| parent | 59ed0a109bf5add2efcef459080837b11066c6fb (diff) | |
| download | SCons-7adebb06bb6055345cc584377159d8052ea39e1b.zip SCons-7adebb06bb6055345cc584377159d8052ea39e1b.tar.gz SCons-7adebb06bb6055345cc584377159d8052ea39e1b.tar.bz2 | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Accumulated small fixers: renames, next, zip, and intern.
Files that were modified or added while developing on branches/pending didn't
have the fixers previously applied. This patchset picks up those.
Diffstat (limited to 'src/engine/SCons/compat/_scons_UserString.py')
| -rw-r--r-- | src/engine/SCons/compat/_scons_UserString.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/compat/_scons_UserString.py b/src/engine/SCons/compat/_scons_UserString.py index dfc2b30..59be10b 100644 --- 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): |