Fix various bugs caused by Python 2.1

2 files changed, 5 insertions, 1 deletions

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index de15712..03afc27 100644
--- 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 e0e958b..d3a1ee8 100644
--- 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)