Final merge from trunk

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/szager-python-builtin@12595 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Stefan Zager 2011-04-03 07:37:35 +00:00
commit 0cdf8658c7
9 changed files with 114 additions and 165 deletions

View file

@ -1,25 +1,23 @@
from exception_order import *
# This test is expected to fail with -builtin option.
# Throwing builtin classes as exceptions not supported
a = A()
try:
a.foo()
# Throwing builtin classes as exceptions not supported
#except E1,e:
# pass
except:
# raise RuntimeError, "bad exception order"
except E1,e:
pass
except:
raise RuntimeError, "bad exception order"
try:
a.bar()
# Throwing builtin classes as exceptions not supported
#except E2,e:
# pass
except:
# raise RuntimeError, "bad exception order"
except E2,e:
pass
except:
raise RuntimeError, "bad exception order"
try:
a.foobar()
@ -32,18 +30,14 @@ except RuntimeError,e:
try:
a.barfoo(1)
# Throwing builtin classes as exceptions not supported
#except E1,e:
# pass
except:
# raise RuntimeError, "bad exception order"
except E1,e:
pass
except:
raise RuntimeError, "bad exception order"
try:
a.barfoo(2)
# Throwing builtin classes as exceptions not supported
#except E2,e:
# pass
except:
# raise RuntimeError, "bad exception order"
except E2,e:
pass
except:
raise RuntimeError, "bad exception order"