Merge from trunk

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

Examples/test-suite/python/Makefile.in

@@ -31,42 +31,41 @@ PY2TO3 = 2to3 -x import
 
 CPP_TEST_CASES += \
 	argcargvtest \
-	python_autodoc \
-	python_append \
 	callback \
 	complextest \
 	director_stl \
 	director_wstring \
 	file_test \
 	iadd \
-	inout \
-	input \
-	inplaceadd \
 	implicittest \
+	inout \
+	inplaceadd \
+	input \
 	li_cstring \
 	li_cwstring \
 	li_factory \
 	li_implicit \
-	li_std_vectora \
-	li_std_vector_extra \
 	li_std_map_member \
 	li_std_multimap \
 	li_std_pair_extra \
 	li_std_set \
 	li_std_stream \
 	li_std_string_extra \
+	li_std_vectora \
+	li_std_vector_extra \
 	li_std_wstream \
 	li_std_wstring \
 	primitive_types \
         python_abstractbase \
+	python_append \
 	python_kwargs \
 	python_nondynamic \
 	python_overload_simple_cast \
 	python_richcompare \
+	simutry \
 	std_containers \
 	swigobject \
-	template_matrix \
-	simutry
+	template_matrix
 
 #	li_std_carray
 #	director_profile
@@ -88,11 +87,12 @@ C_TEST_CASES += \
 include $(srcdir)/../common.mk
 
 BUILTIN_BROKEN = \
-    li_std_string_extra.cpptest \
-    li_std_wstring.cpptest \
     default_constructor.cpptest \
     director_exception.cpptest \
     exception_order.cpptest \
+    li_std_string_extra.cpptest \
+    li_std_wstring.cpptest \
+    python_abstractbase.cpptest \
     threads_exception.cpptest
 
 BUILTIN_NOT_BROKEN = $(filter-out $(BUILTIN_BROKEN),$(NOT_BROKEN_TEST_CASES))

Examples/test-suite/python/varargs_runme.py

@@ -16,3 +16,21 @@ if varargs.test_def("Hello",1) != "Hello":
 
 if varargs.test_def("Hello") != "Hello":
     raise RuntimeError, "Failed"
+
+###
+if varargs.test_plenty("Hello") != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs.test_plenty("Hello", 1) != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs.test_plenty("Hello", 1, 2) != "Hello":
+    raise RuntimeError, "Failed"
+
+try:
+    varargs.test_plenty("Hello", 1, 2, 3)
+    raise RuntimeError
+except NotImplementedError:
+    pass
+except TypeError:
+    pass