diff options
Diffstat (limited to 'engine/SCons/Script/__init__.py')
| -rw-r--r-- | engine/SCons/Script/__init__.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engine/SCons/Script/__init__.py b/engine/SCons/Script/__init__.py index 97af6da..b5b5222 100644 --- a/engine/SCons/Script/__init__.py +++ b/engine/SCons/Script/__init__.py @@ -34,15 +34,14 @@ it goes here. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/__init__.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Script/__init__.py 5023 2010/06/14 22:05:46 scons" import time start_time = time.time() +import collections import os -import string import sys -import UserList # Special chicken-and-egg handling of the "--debug=memoizer" flag: # @@ -58,16 +57,15 @@ import UserList # the "--debug=memoizer" flag and enable Memoizer before we import any # of the other modules that use it. -_args = sys.argv + string.split(os.environ.get('SCONSFLAGS', '')) +_args = sys.argv + os.environ.get('SCONSFLAGS', '').split() if "--debug=memoizer" in _args: import SCons.Memoize import SCons.Warnings try: SCons.Memoize.EnableMemoization() except SCons.Warnings.Warning: - # Some warning was thrown (inability to --debug=memoizer on - # Python 1.5.2 because it doesn't have metaclasses). Arrange - # for it to be displayed or not after warnings are configured. + # Some warning was thrown. Arrange for it to be displayed + # or not after warnings are configured. import Main exc_type, exc_value, tb = sys.exc_info() Main.delayed_warnings.append((exc_type, exc_value)) @@ -184,7 +182,7 @@ CScan = SCons.Defaults.CScan DefaultEnvironment = SCons.Defaults.DefaultEnvironment # Other variables we provide. -class TargetList(UserList.UserList): +class TargetList(collections.UserList): def _do_nothing(self, *args, **kw): pass def _add_Default(self, list): @@ -211,7 +209,7 @@ _build_plus_default = TargetList() def _Add_Arguments(alist): for arg in alist: - a, b = string.split(arg, '=', 1) + a, b = arg.split('=', 1) ARGUMENTS[a] = b ARGLIST.append((a, b)) |