Update to SCons 1.2.0.

third_party/scons/scons-local/SCons/Util.py

 """SCons.Util
 
 Various utility functions go here.
 
 """
 
 #
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Util.py 3603 2008/10/10 05:46:45 scons"
+__revision__ = "src/engine/SCons/Util.py 3842 2008/12/20 22:59:52 scons"
 
 import copy
 import os
 import os.path
 import re
 import string
 import sys
 import types
 
 from UserDict import UserDict
@@ skipping 974 matching lines @@
 
     This is a list that uses Split() to split an initial string along
     white-space arguments, and similarly to split any strings that get
     added.  This allows us to Do the Right Thing with Append() and
     Prepend() (as well as straight Python foo = env['VAR'] + 'arg1
     arg2') regardless of whether a user adds a list or a string to a
     command-line construction variable.
     """
     def __init__(self, seq = []):
         UserList.__init__(self, Split(seq))
+    def __add__(self, other):
+        return UserList.__add__(self, CLVar(other))
+    def __radd__(self, other):
+        return UserList.__radd__(self, CLVar(other))
     def __coerce__(self, other):
         return (self, CLVar(other))
     def __str__(self):
         return string.join(self.data)
 
 # A dictionary that preserves the order in which items are added.
 # Submitted by David Benjamin to ActiveState's Python Cookbook web site:
 #     http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747
 # Including fixes/enhancements from the follow-on discussions.
 class OrderedDict(UserDict):
@@ skipping 529 matching lines @@
     def __getattr__(self, mname):
         return self
     def __setattr__(self, name, value):
         return self
     def __delattr__(self, name):
         return self
 
 
 
 del __revision__