diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-03-27 07:39:52 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-03-27 07:39:52 (GMT) |
commit | 59ed0a109bf5add2efcef459080837b11066c6fb (patch) | |
tree | fff879b4f9676a72e16c0f7b4dd969f050038b4f /src/engine/SCons/Variables | |
parent | 00a3188193ba1feef927cf18e7f5fc20ad71b848 (diff) | |
download | SCons-59ed0a109bf5add2efcef459080837b11066c6fb.zip SCons-59ed0a109bf5add2efcef459080837b11066c6fb.tar.gz SCons-59ed0a109bf5add2efcef459080837b11066c6fb.tar.bz2 |
http://scons.tigris.org/issues/show_bug.cgi?id=2329
Applied a number of idiomatic changes.
Uses of the 'sort()' method were converted into calls of 'sorted()' when
possible and the sorted() expression was inserted into a subsequent statement
whenever that made sense.
The statement 'while 1:' was changed to 'while True:'.
Names from the 'types' module (e.g., 'types.FooType') were converted to the
equivalent build-in type (e.g., 'foo').
Comparisons between types were changed to use 'isinstance()'.
Diffstat (limited to 'src/engine/SCons/Variables')
-rw-r--r-- | src/engine/SCons/Variables/ListVariable.py | 3 | ||||
-rw-r--r-- | src/engine/SCons/Variables/__init__.py | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/engine/SCons/Variables/ListVariable.py b/src/engine/SCons/Variables/ListVariable.py index 36b530a..5980f33 100644 --- a/src/engine/SCons/Variables/ListVariable.py +++ b/src/engine/SCons/Variables/ListVariable.py @@ -63,8 +63,7 @@ import SCons.Util class _ListVariable(UserList.UserList): def __init__(self, initlist=[], allowedElems=[]): UserList.UserList.__init__(self, [_f for _f in initlist if _f]) - self.allowedElems = allowedElems[:] - self.allowedElems.sort() + self.allowedElems = sorted(allowedElems) def __cmp__(self, other): raise NotImplementedError diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py index 27f694f..09d4e29 100644 --- a/src/engine/SCons/Variables/__init__.py +++ b/src/engine/SCons/Variables/__init__.py @@ -123,7 +123,7 @@ class Variables: putting it in the environment. """ - if SCons.Util.is_List(key) or type(key) == type(()): + if SCons.Util.is_List(key) or isinstance(key, tuple): self._do_add(*key) return @@ -284,8 +284,7 @@ class Variables: """ if sort: - options = self.options[:] - options.sort(lambda x,y: sort(x.key,y.key)) + options = sorted(self.options, cmp=lambda x,y: sort(x.key,y.key)) else: options = self.options |