Merge from trunk

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@13053 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/python/Makefile.in

@@ -46,6 +46,7 @@ CPP_TEST_CASES += \
 	li_cwstring \
 	li_factory \
 	li_implicit \
+	li_std_containers_int \
 	li_std_map_member \
 	li_std_multimap \
 	li_std_pair_extra \

Examples/test-suite/python/autodoc_runme.py

@@ -2,7 +2,7 @@ from autodoc import *
 
 def check(got, expected):
   if expected != got:
-    raise RuntimeError("\n" + "Expected: [" + expected + "]\n" + "Got     : [" + got + "]")
+    raise RuntimeError("\n" + "Expected: [" + str(expected) + "]\n" + "Got     : [" + str(got) + "]")
 
 check(A.__doc__, "Proxy of C++ A class")
 check(A.funk.__doc__, "just a string")

Examples/test-suite/python/li_boost_shared_ptr_template_runme.py

@@ -8,8 +8,9 @@ if d.bar() != 2:
   raise RuntimeError
 if bar_getter(b) != 1:
   raise RuntimeError
-if bar_getter(d) != 2:
-  raise RuntimeError
+# Fix reverted in rev 12953
+#if bar_getter(d) != 2:
+#  raise RuntimeError
 
 b = BaseDefaultInt()
 d = DerivedDefaultInt()
@@ -22,7 +23,8 @@ if d2.bar2() != 4:
   raise RuntimeError
 if bar2_getter(b) != 3:
   raise RuntimeError
-if bar2_getter(d) != 4:
-  raise RuntimeError
-if bar2_getter(d2) != 4:
-  raise RuntimeError
+# Fix reverted in rev 12953
+#if bar2_getter(d) != 4:
+#  raise RuntimeError
+#if bar2_getter(d2) != 4:
+#  raise RuntimeError

Examples/test-suite/python/threads_exception_runme.py

@@ -26,7 +26,7 @@ except threads_exception.Exc,e:
   if e.code != 42:
     raise RuntimeError
   if e.msg != "Hosed":
-    raise RuntimeError
+    raise RuntimeError, "bad... msg: %s" % e.msg
 
 for i in range(1,4):
   try: