Final merge from trunk

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/szager-python-builtin@12595 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2011-04-03 07:37:35 +00:00 · 2011-04-03 07:37:35 +00:00 · 0cdf8658c7
commit 0cdf8658c7
parent c95cc72454 76e7d01c4e
9 changed files with 114 additions and 165 deletions
--- a/Examples/test-suite/python/threads_exception_runme.py
+++ b/Examples/test-suite/python/threads_exception_runme.py
@ -18,9 +18,10 @@ except RuntimeError,e:
  if e.args[0] != "I died.":
    raise RuntimeError

-try:
+# This is expected fail with -builtin option
 # Throwing builtin classes as exceptions not supported
-#  t.hosed()
+try:
+  t.hosed()
  pass
 except threads_exception.Exc,e:
  if e.code != 42: