Fix various bugs caused by Python 2.1

git-svn-id: http://scons.tigris.org/svn/scons/trunk@79 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index de1571231b378278c8e9abd1064f651444aade5d..03afc2729269b433d28aa179170b19084f480df6 100644 (file)
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -49,8 +49,12 @@ class Node:
 
     def add_dependency(self, depend):
        """Adds dependencies. The depends argument must be a list."""
+        if type(depend) is not type([]):
+            raise TypeError("depend must be a list")
        self.depends.extend(depend)
 
     def add_source(self, source):
        """Adds sources. The source argument must be a list."""
+        if type(source) is not type([]):
+            raise TypeError("source must be a list")
        self.sources.extend(source)

diff --git a/src/script/scons.py b/src/script/scons.py
index e0e958b7638f5afa1ef2bdf33fa3df770cee3915..d3a1ee8d2fe739df3e83f48a4dd45694edd1ac0f 100644 (file)
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -519,7 +519,7 @@ def main():
        # It's all right if there's no SCONSFLAGS environment variable.
        pass
     except getopt_err, x:
-       _scons_user_warning("SCONSFLAGS " + x)
+       _scons_user_warning("SCONSFLAGS " + str(x))
     else:
        for opt, arg in cmd_opts:
            opt_func[opt](opt, arg)