jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-dependency-on-2to3'

Browse source 
* remove-dependency-on-2to3:
  Remove need for Python 2to3
  Modify examples to be both Python 2 and 3 compatible
  Remove python3 specific runme3.py test files
  Convert python tests using 2to3
  Convert python test scripts to be Python 2 and 3 compatible
  Convert swigobject python test to be python 2 and 3 compatible
  Convert two tests to work with both Python 2 and 3
  Improve director_exception Python test
  Remove further print statements from Python tests
  Improve Python testing catching exceptions
  Improve contract Python testcase testing
  Remove print statements from Python tests
This commit is contained in:
William S Fulton 2020-08-15 19:03:38 +01:00
commit baec830f75
147 changed files with 1193 additions and 1427 deletions
Download patch file Download diff file Expand all files Collapse all files

87
Examples/test-suite/python/Makefile.in
View file

@ -10,20 +10,10 @@ endif
LANGUAGE = python
PYTHON = $(PYBIN)
SCRIPTSUFFIX = _runme.py
PYCODESTYLE = @PYCODESTYLE@
PYCODESTYLE_FLAGS = --ignore=E252,E30,E402,E501,E731,E741,W291,W391
#*_runme.py for Python 2.x, *_runme3.py for Python 3.x
PY2SCRIPTSUFFIX = _runme.py
PY3SCRIPTSUFFIX = _runme3.py
PY2TO3 = @PY2TO3@ -x import
ifeq (,$(PY3))
SCRIPTSUFFIX = $(PY2SCRIPTSUFFIX)
else
SCRIPTSUFFIX = $(PY3SCRIPTSUFFIX)
endif
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
@ -108,7 +98,6 @@ C_TEST_CASES += \
include $(srcdir)/../common.mk
# Overridden variables here
SCRIPTDIR = .
LIBS = -L.
VALGRIND_OPT += --suppressions=pythonswig.supp
@ -117,35 +106,25 @@ VALGRIND_OPT += --suppressions=pythonswig.supp
# Rules for the different types of tests
%.cpptest:
+$(convert_testcase)
$(setup)
+$(swig_and_compile_cpp)
$(check_pep8)
$(run_testcase)
%.ctest:
+$(convert_testcase)
$(setup)
+$(swig_and_compile_c)
$(check_pep8)
$(run_testcase)
%.multicpptest:
+$(convert_testcase)
$(setup)
+$(swig_and_compile_multi_cpp)
$(check_pep8_multi_cpp)
$(run_testcase)
# Runs the testcase. A testcase is only run if
# a file is found which has _runme.py (or _runme3.py for Python 3) appended after the testcase name.
py_runme = $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)
py2_runme = $(SCRIPTPREFIX)$*$(PY2SCRIPTSUFFIX)
py3_runme = $(SCRIPTPREFIX)$*$(PY3SCRIPTSUFFIX)
# Python code style checking
ifneq (,$(PYCODESTYLE))
check_pep8 = $(COMPILETOOL) $(PYCODESTYLE) $(PYCODESTYLE_FLAGS) $(SCRIPTPREFIX)$*.py
@ -155,70 +134,16 @@ check_pep8_multi_cpp = \
done
endif
run_python = env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=.:$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(py_runme)
# Runs the testcase. A testcase is only run if
# a file is found which has _runme.py appended after the testcase name.
run_testcase = \
if [ -f $(SCRIPTDIR)/$(py_runme) ]; then \
$(run_python);\
if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=.:$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
fi
# Grab runme file ready for running: copied for out of source tree builds, and/or run 2to3
# Note terminal (double colon) rules creating runme files to fix possible infinite recursion,
# see https://github.com/swig/swig/pull/688
ifeq ($(SCRIPTDIR),$(srcdir))
# in source tree build
ifeq (,$(PY3))
convert_testcase =
else
convert_testcase = \
if [ -f $(srcdir)/$(py2_runme) ]; then \
$(MAKE) $(SCRIPTDIR)/$(py_runme); \
fi
# For converting python 2 tests into Python 3 tests
$(SCRIPTDIR)/$(SCRIPTPREFIX)%$(SCRIPTSUFFIX):: $(srcdir)/$(SCRIPTPREFIX)%$(PY2SCRIPTSUFFIX)
cp $< $@
$(PY2TO3) -w $@ >/dev/null 2>&1
endif
else
# out of source tree build
ifeq (,$(PY3))
convert_testcase = \
if [ -f $(srcdir)/$(py2_runme) ]; then \
$(MAKE) $(SCRIPTDIR)/$(py_runme); \
fi
$(SCRIPTDIR)/$(SCRIPTPREFIX)%$(SCRIPTSUFFIX):: $(srcdir)/$(SCRIPTPREFIX)%$(PY2SCRIPTSUFFIX)
cp $< $@
else
convert_testcase = \
if [ -f $(srcdir)/$(py2_runme) ]; then \
$(MAKE) $(SCRIPTDIR)/$(py_runme); \
elif [ -f $(srcdir)/$(py3_runme) ]; then \
$(MAKE) $(SCRIPTDIR)/$(py3_runme); \
fi
# For when there is a _runme3.py instead of a _runme.py, ie a Python 3 only run test
$(SCRIPTDIR)/$(SCRIPTPREFIX)%$(SCRIPTSUFFIX):: $(srcdir)/$(SCRIPTPREFIX)%$(PY3SCRIPTSUFFIX)
cp $< $@
# For converting python 2 tests into Python 3 tests
$(SCRIPTDIR)/$(SCRIPTPREFIX)%$(SCRIPTSUFFIX):: $(srcdir)/$(SCRIPTPREFIX)%$(PY2SCRIPTSUFFIX)
cp $< $@
$(PY2TO3) -w $@ >/dev/null 2>&1
endif
endif
# Clean: remove the generated .py file
# We only remove the _runme3.py if it is generated by 2to3 from a _runme.py.
%.clean:
@rm -f $*.py
@if test -f $(srcdir)/$(py2_runme); then rm -f $(SCRIPTDIR)/$(py3_runme) $(SCRIPTDIR)/$(py3_runme).bak; fi
@if test "x$(SCRIPTDIR)" != "x$(srcdir)"; then rm -f $(SCRIPTDIR)/$(py_runme); fi
clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR='$(SRCDIR)' python_clean

1
Examples/test-suite/python/argcargvtest_runme.py
View file

@ -6,7 +6,6 @@ if mainc(largs) != 3:
targs = ("hi", "hola")
if mainv(targs, 1) != "hola":
print(mainv(targs, 1))
raise RuntimeError("bad main typemap")
targs = ("hi", "hola")

4
Examples/test-suite/python/array_member_runme.py
View file

@ -5,7 +5,7 @@ f.data = cvar.global_data
for i in range(0, 8):
if get_value(f.data, i) != get_value(cvar.global_data, i):
raise RuntimeError, "Bad array assignment"
raise RuntimeError("Bad array assignment")
for i in range(0, 8):
@ -15,4 +15,4 @@ cvar.global_data = f.data
for i in range(0, 8):
if get_value(f.data, i) != get_value(cvar.global_data, i):
raise RuntimeError, "Bad array assignment"
raise RuntimeError("Bad array assignment")

19
Examples/test-suite/python/char_binary_runme.py
View file

@ -2,16 +2,14 @@ from char_binary import *
t = Test()
if t.strlen("hile") != 4:
print t.strlen("hile")
raise RuntimeError, "bad multi-arg typemap"
raise RuntimeError("bad multi-arg typemap {}".format(t.strlen("hile")))
if t.ustrlen("hile") != 4:
print t.ustrlen("hile")
raise RuntimeError, "bad multi-arg typemap"
raise RuntimeError("bad multi-arg typemap {}".format(t.ustrlen("hile")))
if t.strlen("hil\0") != 4:
raise RuntimeError, "bad multi-arg typemap"
raise RuntimeError("bad multi-arg typemap")
if t.ustrlen("hil\0") != 4:
raise RuntimeError, "bad multi-arg typemap"
raise RuntimeError("bad multi-arg typemap")
#
# creating a raw char*
@ -25,18 +23,17 @@ pchar_setitem(pc, 4, 0)
if t.strlen(pc) != 4:
raise RuntimeError, "bad multi-arg typemap"
raise RuntimeError("bad multi-arg typemap")
if t.ustrlen(pc) != 4:
raise RuntimeError, "bad multi-arg typemap"
raise RuntimeError("bad multi-arg typemap")
cvar.var_pchar = pc
if cvar.var_pchar != "hola":
print cvar.var_pchar
raise RuntimeError, "bad pointer case"
raise RuntimeError("bad pointer case {}".format(cvar.var_pchar))
cvar.var_namet = pc
# if cvar.var_namet != "hola\0":
if cvar.var_namet != "hola":
raise RuntimeError, "bad pointer case"
raise RuntimeError("bad pointer case")
delete_pchar(pc)

10
Examples/test-suite/python/complextest_runme.py
View file

@ -3,16 +3,16 @@ import complextest
a = complex(-1, 2)
if complextest.Conj(a) != a.conjugate():
raise RuntimeError, "bad complex mapping"
raise RuntimeError("bad complex mapping")
if complextest.Conjf(a) != a.conjugate():
raise RuntimeError, "bad complex mapping"
raise RuntimeError("bad complex mapping")
if complextest.Conj2(a) != a.conjugate():
raise RuntimeError, "bad complex mapping"
raise RuntimeError("bad complex mapping")
if complextest.Conjf2(a) != a.conjugate():
raise RuntimeError, "bad complex mapping"
raise RuntimeError("bad complex mapping")
v = (complex(1, 2), complex(2, 3), complex(4, 3), 1)
@ -27,4 +27,4 @@ p = complextest.ComplexPair()
p.z1 = complex(0, 1)
p.z2 = complex(0, -1)
if complextest.Conj(p.z2) != p.z1:
raise RuntimeError, "bad complex mapping"
raise RuntimeError("bad complex mapping")

19
Examples/test-suite/python/constover_runme.py
View file

@ -4,33 +4,26 @@ error = 0
p = constover.test("test")
if p != "test":
print "test failed!"
error = 1
raise RuntimeError("test failed!")
p = constover.test_pconst("test")
if p != "test_pconst":
print "test_pconst failed!"
error = 1
raise RuntimeError("test_pconst failed!")
f = constover.Foo()
p = f.test("test")
if p != "test":
print "member-test failed!"
error = 1
raise RuntimeError("member-test failed!")
p = f.test_pconst("test")
if p != "test_pconst":
print "member-test_pconst failed!"
error = 1
raise RuntimeError("member-test_pconst failed!")
p = f.test_constm("test")
if p != "test_constmethod":
print "member-test_constm failed!"
error = 1
raise RuntimeError("member-test_constm failed!")
p = f.test_pconstm("test")
if p != "test_pconstmethod":
print "member-test_pconstm failed!"
error = 1
raise RuntimeError("member-test_pconstm failed!")
sys.exit(error)

90
Examples/test-suite/python/contract_runme.py
View file

@ -2,141 +2,141 @@ import contract
contract.test_preassert(1, 2)
try:
contract.test_preassert(-1)
print "Failed! Preassertions are broken"
except:
contract.test_preassert(-1, 3)
raise Exception("Failed! Preassertions are broken")
except RuntimeError:
pass
contract.test_postassert(3)
try:
contract.test_postassert(-3)
print "Failed! Postassertions are broken"
except:
raise Exception("Failed! Postassertions are broken")
except RuntimeError:
pass
contract.test_prepost(2, 3)
contract.test_prepost(5, -4)
try:
contract.test_prepost(-3, 4)
print "Failed! Preassertions are broken"
except:
raise Exception("Failed! Preassertions are broken")
except RuntimeError:
pass
try:
contract.test_prepost(4, -10)
print "Failed! Postassertions are broken"
raise Exception("Failed! Postassertions are broken")
except:
except RuntimeError:
pass
f = contract.Foo()
f.test_preassert(4, 5)
try:
f.test_preassert(-2, 3)
print "Failed! Method preassertion."
except:
raise Exception("Failed! Method preassertion.")
except RuntimeError:
pass
f.test_postassert(4)
try:
f.test_postassert(-4)
print "Failed! Method postassertion"
except:
raise Exception("Failed! Method postassertion")
except RuntimeError:
pass
f.test_prepost(3, 4)
f.test_prepost(4, -3)
try:
f.test_prepost(-4, 2)
print "Failed! Method preassertion."
except:
raise Exception("Failed! Method preassertion.")
except RuntimeError:
pass
try:
f.test_prepost(4, -10)
print "Failed! Method postassertion."
except:
raise Exception("Failed! Method postassertion.")
except RuntimeError:
pass
contract.Foo_stest_prepost(4, 0)
try:
contract.Foo_stest_prepost(-4, 2)
print "Failed! Static method preassertion"
except:
raise Exception("Failed! Static method preassertion")
except RuntimeError:
pass
try:
contract.Foo_stest_prepost(4, -10)
print "Failed! Static method posteassertion"
except:
raise Exception("Failed! Static method posteassertion")
except RuntimeError:
pass
b = contract.Bar()
try:
b.test_prepost(2, -4)
print "Failed! Inherited preassertion."
except:
raise Exception("Failed! Inherited preassertion.")
except RuntimeError:
pass
d = contract.D()
try:
d.foo(-1, 1, 1, 1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.foo(1, -1, 1, 1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.foo(1, 1, -1, 1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.foo(1, 1, 1, -1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.foo(1, 1, 1, 1, -1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.bar(-1, 1, 1, 1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.bar(1, -1, 1, 1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.bar(1, 1, -1, 1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.bar(1, 1, 1, -1, 1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
try:
d.bar(1, 1, 1, 1, -1)
print "Failed! Inherited preassertion (D)."
except:
raise Exception("Failed! Inherited preassertion (D).")
except RuntimeError:
pass
# Namespace
my = contract.myClass(1)
try:
my = contract.myClass(0)
print "Failed! constructor preassertion"
except:
raise Exception("Failed! constructor preassertion")
except RuntimeError:
pass

10
Examples/test-suite/python/cpp11_alternate_function_syntax_runme.py
View file

@ -4,20 +4,20 @@ a = cpp11_alternate_function_syntax.SomeStruct()
res = a.addNormal(4, 5)
if res != 9:
raise RuntimeError, ("SomeStruct::addNormal(4,5) returns ", res, " should be 9.")
raise RuntimeError("SomeStruct::addNormal(4,5) returns ", res, " should be 9.")
res = a.addAlternate(4, 5)
if res != 9:
raise RuntimeError, ("SomeStruct::addAlternate(4,5) returns ", res, " should be 9.")
raise RuntimeError("SomeStruct::addAlternate(4,5) returns ", res, " should be 9.")
res = a.addAlternateConst(4, 5)
if res != 9:
raise RuntimeError, ("SomeStruct::addAlternateConst(4,5) returns ", res, " should be 9.")
raise RuntimeError("SomeStruct::addAlternateConst(4,5) returns ", res, " should be 9.")
res = a.addAlternateNoExcept(4, 5)
if res != 9:
raise RuntimeError, ("SomeStruct::addAlternateNoExcept(4,5) returns ", res, " should be 9.")
raise RuntimeError("SomeStruct::addAlternateNoExcept(4,5) returns ", res, " should be 9.")
res = a.addAlternateConstNoExcept(4, 5)
if res != 9:
raise RuntimeError, ("SomeStruct::addAlternateConstNoExcept(4,5) returns ", res, " should be 9.")
raise RuntimeError("SomeStruct::addAlternateConstNoExcept(4,5) returns ", res, " should be 9.")

8
Examples/test-suite/python/cpp11_decltype_runme.py
View file

@ -3,16 +3,16 @@ import cpp11_decltype
a = cpp11_decltype.A()
a.i = 5
if a.i != 5:
raise RuntimeError, "Assignment to a.i failed."
raise RuntimeError("Assignment to a.i failed.")
a.j = 10
if a.j != 10:
raise RuntimeError, "Assignment to a.j failed."
raise RuntimeError("Assignment to a.j failed.")
b = a.foo(5)
if b != 10:
raise RuntimeError, "foo(5) should return 10."
raise RuntimeError("foo(5) should return 10.")
b = a.foo(6)
if b != 0:
raise RuntimeError, "foo(6) should return 0."
raise RuntimeError("foo(6) should return 0.")

16
Examples/test-suite/python/cpp11_hash_tables_runme.py
View file

@ -10,14 +10,14 @@ for x in [cpp11_hash_tables.MapIntInt({1:7}),
cpp11_hash_tables.UnorderedMultiMapIntInt({1:7})
]:
swig_assert_equal([(k, v) for k, v in x.iteritems()], [(1, 7)])
swig_assert_equal(x.keys(), [1])
swig_assert_equal(x.values(), [7])
swig_assert_equal(x.items(), [(1, 7)])
swig_assert_equal([(k, v) for k, v in x.items()], [(1, 7)])
swig_assert_equal(list(x.keys()), [1])
swig_assert_equal(list(x.values()), [7])
swig_assert_equal(list(x.items()), [(1, 7)])
swig_assert_equal([k for k in x], [1])
swig_assert_equal([i for i in x.iterkeys()], [1])
swig_assert_equal([i for i in x.itervalues()], [7])
swig_assert_equal([i for i in x.iteritems()], [(1, 7)])
swig_assert_equal([i for i in x.keys()], [1])
swig_assert_equal([i for i in x.values()], [7])
swig_assert_equal([i for i in x.items()], [(1, 7)])
swig_assert_equal(x[1], 7)
swig_assert_equal(2 in x, False)
@ -33,7 +33,7 @@ for x in [cpp11_hash_tables.MapIntInt({1:7}),
for x in [cpp11_hash_tables.MultiMapIntInt({1:7}),
cpp11_hash_tables.UnorderedMultiMapIntInt({1:7})]:
x[1] = 9
swig_assert_equal(sorted([v for k, v in x.iteritems()]), [7, 9])
swig_assert_equal(sorted([v for k, v in x.items()]), [7, 9])
swig_assert_equal(len(x), 2)
for x in [cpp11_hash_tables.SetInt([1]),

8
Examples/test-suite/python/cpp11_null_pointer_constant_runme.py
View file

@ -3,15 +3,15 @@ import cpp11_null_pointer_constant
a = cpp11_null_pointer_constant.A()
if a._myA != None:
raise RuntimeError, (
raise RuntimeError(
"cpp11_null_pointer_constant: _myA should be None, but is ", a._myA)
b = cpp11_null_pointer_constant.A()
if a._myA != b._myA:
raise RuntimeError, (
raise RuntimeError(
"cpp11_null_pointer_constant: a._myA should be the same as b._myA, but ", a._myA, "!=", b._myA)
a._myA = cpp11_null_pointer_constant.A()
if a._myA == None:
raise RuntimeError, (
"cpp11_null_pointer_constant: _myA should be object, but is None")
raise RuntimeError((
"cpp11_null_pointer_constant: _myA should be object, but is None"))

10
Examples/test-suite/python/cpp11_raw_string_literals_runme.py
View file

@ -34,19 +34,19 @@ if cvar.aa != "Wide string":
raise RuntimeError
if cvar.bb != "UTF-8 string":
raise RuntimeError, cvar.wide
raise RuntimeError(cvar.wide)
if cvar.xx != ")I'm an \"ascii\" \\ string.":
raise RuntimeError, cvar.xx
raise RuntimeError(cvar.xx)
if cvar.ee != ")I'm an \"ascii\" \\ string.":
raise RuntimeError, cvar.ee
raise RuntimeError(cvar.ee)
if cvar.ff != "I'm a \"raw wide\" \\ string.":
raise RuntimeError, cvar.ff
raise RuntimeError(cvar.ff)
if cvar.gg != "I'm a \"raw UTF-8\" \\ string.":
raise RuntimeError, cvar.gg
raise RuntimeError(cvar.gg)
def check(got, expected):

8
Examples/test-suite/python/cpp11_result_of_runme.py
View file

@ -2,10 +2,10 @@ import cpp11_result_of
result = cpp11_result_of.test_result(cpp11_result_of.SQUARE, 3.0)
if result != 9.0:
raise RuntimeError, "test_result(square, 3.0) is not 9.0. Got: " + str(
result)
raise RuntimeError("test_result(square, 3.0) is not 9.0. Got: " + str(
result))
result = cpp11_result_of.test_result_alternative1(cpp11_result_of.SQUARE, 3.0)
if result != 9.0:
raise RuntimeError, "test_result_alternative1(square, 3.0) is not 9.0. Got: " + str(
result)
raise RuntimeError("test_result_alternative1(square, 3.0) is not 9.0. Got: " + str(
result))

8
Examples/test-suite/python/cpp11_rvalue_reference_runme.py
View file

@ -4,24 +4,24 @@ a = cpp11_rvalue_reference.A()
a.setAcopy(5)
if a.getAcopy() != 5:
raise RunTimeError, ("int A::getAcopy() value is ",
raise RunTimeError("int A::getAcopy() value is ",
a.getAcopy(), " should be 5")
ptr = a.getAptr()
a.setAptr(ptr)
if a.getAcopy() != 5:
raise RunTimeError, ("after A::setAptr(): int A::getAcopy() value is ", a.getAcopy(
raise RunTimeError("after A::setAptr(): int A::getAcopy() value is ", a.getAcopy(
), " should be 5")
a.setAref(ptr)
if a.getAcopy() != 5:
raise RunTimeError, ("after A::setAref(): int A::getAcopy() value is ", a.getAcopy(
raise RunTimeError("after A::setAref(): int A::getAcopy() value is ", a.getAcopy(
), " should be 5")
rvalueref = a.getAmove()
a.setAmove(rvalueref)
if a.getAcopy() != 5:
raise RunTimeError, ("after A::setAmove(): int A::getAcopy() value is ", a.getAcopy(
raise RunTimeError("after A::setAmove(): int A::getAcopy() value is ", a.getAcopy(
), " should be 5")

14
Examples/test-suite/python/cpp11_std_array_runme.py
View file

@ -3,7 +3,7 @@ import sys
def failed(a, b, msg):
raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b))
raise RuntimeError(msg + " " + str(list(a)) + " " + str(list(b)))
def compare_sequences(a, b):
@ -26,8 +26,8 @@ def steps_exception(swigarray, i, j, step):
a = swigarray[i::step]
else:
a = swigarray[i:j:step]
raise RuntimeError, "swigarray[" + str(i) + ":" + str(j) + ":" + str(step) + "] missed steps exception for " + str(list(swigarray))
except ValueError, e:
raise RuntimeError("swigarray[" + str(i) + ":" + str(j) + ":" + str(step) + "] missed steps exception for " + str(list(swigarray)))
except ValueError as e:
# print("exception: {}".format(e))
pass
@ -43,16 +43,16 @@ def del_exception(swigarray, i, j, step):
del swigarray[i::step]
else:
del swigarray[i:j:step]
raise RuntimeError, "swigarray[" + str(i) + ":" + str(j) + ":" + str(step) + "] missed del exception for " + str(list(swigarray))
except ValueError, e:
raise RuntimeError("swigarray[" + str(i) + ":" + str(j) + ":" + str(step) + "] missed del exception for " + str(list(swigarray)))
except ValueError as e:
# print("exception: {}".format(e))
pass
def setslice_exception(swigarray, newval):
try:
swigarray[::] = newval
raise RuntimeError, "swigarray[::] = " + str(newval) + " missed set exception for swigarray:" + str(list(swigarray))
except TypeError, e:
raise RuntimeError("swigarray[::] = " + str(newval) + " missed set exception for swigarray:" + str(list(swigarray)))
except TypeError as e:
# print("exception: {}".format(e))
pass

8
Examples/test-suite/python/cpp11_uniform_initialization_runme.py
View file

@ -9,13 +9,13 @@ if var2.getX() != 2:
m = cpp11_uniform_initialization.MoreInit()
if m.charptr != None:
raise RuntimeError, m.charptr
raise RuntimeError(m.charptr)
m.charptr = "hello sir"
if m.charptr != "hello sir":
raise RuntimeError, m.charptr
raise RuntimeError(m.charptr)
if m.more1(m.vi) != 15:
raise RuntimeError, m.vi
raise RuntimeError(m.vi)
if m.more1([-1, 1, 2]) != 2:
raise RuntimeError, m.vi
raise RuntimeError(m.vi)
if m.more1() != 10:
raise RuntimeError

12
Examples/test-suite/python/cpp_enum_runme.py
View file

@ -3,21 +3,17 @@ import cpp_enum
f = cpp_enum.Foo()
if f.hola != f.Hello:
print f.hola
raise RuntimeError
raise RuntimeError("f.hola: {}".format(f.hola))
f.hola = f.Hi
if f.hola != f.Hi:
print f.hola
raise RuntimeError
raise RuntimeError("f.hola: {}".format(f.hola))
f.hola = f.Hello
if f.hola != f.Hello:
print f.hola
raise RuntimeError
raise RuntimeError("f.hola: {}".format(f.hola))
cpp_enum.cvar.hi = cpp_enum.Hello
if cpp_enum.cvar.hi != cpp_enum.Hello:
print cpp_enum.cvar.hi
raise RuntimeError
raise RuntimeError("cpp_enum.cvar.hi: {}".format(cpp_enum.cvar.hi))

34
Examples/test-suite/python/default_args_runme.py
View file

@ -108,48 +108,34 @@ def run(module_name):
if Klass_inc().val != 0:
raise RuntimeError("Klass::inc failed")
tricky_failure = False
tricky = default_args.TrickyInPython()
if tricky.value_m1(10) != -1:
print "trickyvalue_m1 failed"
tricky_failure = True
raise RuntimeError("trickyvalue_m1 failed")
if tricky.value_m1(10, 10) != 10:
print "trickyvalue_m1 failed"
tricky_failure = True
raise RuntimeError("trickyvalue_m1 failed")
if tricky.value_0xabcdef(10) != 0xabcdef:
print "trickyvalue_0xabcdef failed"
tricky_failure = True
raise RuntimeError("trickyvalue_0xabcdef failed")
if tricky.value_0644(10) != 420:
print "trickyvalue_0644 failed"
tricky_failure = True
raise RuntimeError("trickyvalue_0644 failed")
if tricky.value_perm(10) != 420:
print "trickyvalue_perm failed"
tricky_failure = True
raise RuntimeError("trickyvalue_perm failed")
if tricky.value_m01(10) != -1:
print "trickyvalue_m01 failed"
tricky_failure = True
raise RuntimeError("trickyvalue_m01 failed")
if not tricky.booltest2():
print "booltest2 failed"
tricky_failure = True
raise RuntimeError("booltest2 failed")
if tricky.max_32bit_int1() != 0x7FFFFFFF:
print "max_32bit_int1 failed"
tricky_failure = True
raise RuntimeError("max_32bit_int1 failed")
if tricky.min_32bit_int1() != -2147483648:
print "min_32bit_int1 failed"
tricky_failure = True
raise RuntimeError("min_32bit_int1 failed")
if tricky.max_32bit_int2() != 0x7FFFFFFF:
print "max_32bit_int2 failed"
tricky_failure = True
raise RuntimeError("max_32bit_int2 failed")
tricky.too_big_32bit_int1()
tricky.too_small_32bit_int1()
tricky.too_big_32bit_int2()
tricky.too_small_32bit_int2()
if tricky_failure:
raise RuntimeError
default_args.seek()
default_args.seek(10)

32
Examples/test-suite/python/default_constructor_runme.py
View file

@ -16,24 +16,24 @@ dc.delete_AA(aa)
try:
b = dc.new_B()
print "Whoa. new_BB created."
except:
raise RuntimeError("Whoa. new_BB created.")
except TypeError:
pass
del_b = dc.delete_B
try:
bb = dc.new_BB()
print "Whoa. new_BB created."
except:
raise RuntimeError("Whoa. new_BB created.")
except AttributeError:
pass
del_bb = dc.delete_BB
try:
c = dc.new_C()
print "Whoa. new_C created."
except:
raise RuntimeError("Whoa. new_C created.")
except AttributeError:
pass
del_c = dc.delete_C
@ -43,24 +43,24 @@ dc.delete_CC(cc)
try:
d = dc.new_D()
print "Whoa. new_D created"
except:
raise RuntimeError("Whoa. new_D created")
except AttributeError:
pass
del_d = dc.delete_D
try:
dd = dc.new_DD()
print "Whoa. new_DD created"
except:
raise RuntimeError("Whoa. new_DD created")
except AttributeError:
pass
dd = dc.delete_DD
try:
ad = dc.new_AD()
print "Whoa. new_AD created"
except:
raise RuntimeError("Whoa. new_AD created")
except AttributeError:
pass
del_ad = dc.delete_AD
@ -73,8 +73,8 @@ dc.delete_EE(ee)
try:
eb = dc.new_EB()
print "Whoa. new_EB created"
except:
raise RuntimeError("Whoa. new_EB created")
except AttributeError:
pass
del_eb = dc.delete_EB
@ -83,7 +83,7 @@ f = dc.new_F()
try:
del_f = dc.delete_F
print "Whoa. delete_F created"
raise RuntimeError("Whoa. delete_F created")
except AttributeError:
pass
@ -93,7 +93,7 @@ g = dc.new_G()
try:
del_g = dc.delete_G
print "Whoa. delete_G created"
raise RuntimeError("Whoa. delete_G created")
except AttributeError:
pass

4
Examples/test-suite/python/director_abstract_runme.py
View file

@ -13,10 +13,10 @@ class MyFoo(director_abstract.Foo):
a = MyFoo()
if a.ping() != "MyFoo::ping()":
raise RuntimeError, a.ping()
raise RuntimeError(a.ping())
if a.pong() != "Foo::pong();MyFoo::ping()":
raise RuntimeError, a.pong()
raise RuntimeError(a.pong())
class MyExample1(director_abstract.Example1):

2
Examples/test-suite/python/director_alternating_runme.py
View file

@ -2,4 +2,4 @@ from director_alternating import *
id = getBar().id()
if id != idFromGetBar():
raise RuntimeError, "Got wrong id: " + str(id)
raise RuntimeError("Got wrong id: " + str(id))

8
Examples/test-suite/python/director_basic_runme.py
View file

@ -10,18 +10,18 @@ class PyFoo(director_basic.Foo):
a = PyFoo()
if a.ping() != "PyFoo::ping()":
raise RuntimeError, a.ping()
raise RuntimeError(a.ping())
if a.pong() != "Foo::pong();PyFoo::ping()":
raise RuntimeError, a.pong()
raise RuntimeError(a.pong())
b = director_basic.Foo()
if b.ping() != "Foo::ping()":
raise RuntimeError, b.ping()
raise RuntimeError(b.ping())
if b.pong() != "Foo::pong();Foo::ping()":
raise RuntimeError, b.pong()
raise RuntimeError(b.pong())
a = director_basic.A1(1)

2
Examples/test-suite/python/director_comparison_operators_runme.py
View file

@ -8,4 +8,4 @@ class PyFoo(director_comparison_operators.Foo):
a = PyFoo()
if a.test() != "a=1,b=2":
raise RuntimeError, a.test()
raise RuntimeError(a.test())

2
Examples/test-suite/python/director_detect_runme.py
View file

@ -35,4 +35,4 @@ c = b.clone()
vc = c.get_value()
if (v != 3) or (b.val != 5) or (vc != 6):
raise RuntimeError, "Bad virtual detection"
raise RuntimeError("Bad virtual detection")

52
Examples/test-suite/python/director_exception_runme.py
View file

@ -10,7 +10,7 @@ class MyException(Exception):
class MyFoo(Foo):
def ping(self):
raise NotImplementedError, "MyFoo::ping() EXCEPTION"
raise NotImplementedError("MyFoo::ping() EXCEPTION")
class MyFoo2(Foo):
@ -28,74 +28,58 @@ class MyFoo3(Foo):
class MyFoo4(Foo):
def ping(self, *args):
print(type("bad", "call")) # throws TypeError message: type() takes 1 or 3 arguments
t = type("bad", "call") # throws TypeError message: type() takes 1 or 3 arguments
return "Foo4.ping"
# Check that the NotImplementedError raised by MyFoo.ping() is returned by
# MyFoo.pong().
ok = 0
a = MyFoo()
b = launder(a)
try:
b.pong()
except NotImplementedError, e:
if str(e) == "MyFoo::ping() EXCEPTION":
ok = 1
else:
print "Unexpected error message: %s" % str(e)
except:
raise RuntimeError("Exception was not thrown")
except NotImplementedError as e:
if not str(e) == "MyFoo::ping() EXCEPTION":
raise RuntimeError("Unexpected error message: %s" % str(e))
except TypeError:
pass
if not ok:
raise RuntimeError
# Check that the director returns the appropriate TypeError if the return type
# is wrong.
ok = 0
a = MyFoo2()
b = launder(a)
try:
b.pong()
except TypeError, e:
raise RuntimeError("Exception was not thrown")
except TypeError as e:
# fastdispatch mode adds on Additional Information to the exception message - just check the main exception message exists
if str(e).startswith("SWIG director type mismatch in output value of type 'std::string'"):
ok = 1
else:
print "Unexpected error message: %s" % str(e)
if not ok:
raise RuntimeError
if not str(e).startswith("SWIG director type mismatch in output value of type 'std::string'"):
raise RuntimeError("Unexpected error message: %s" % str(e))
# Check that the director can return an exception which requires two arguments
# to the constructor, without mangling it.
ok = 0
a = MyFoo3()
b = launder(a)
try:
b.pong()
except MyException, e:
if e.msg == "foobar":
ok = 1
else:
print "Unexpected error message: %s" % str(e)
if not ok:
raise RuntimeError
raise RuntimeError("Exception was not thrown")
except MyException as e:
if e.msg != "foobar":
raise RuntimeError("Unexpected error message: %s" % str(e))
# Check that the director returns the appropriate TypeError thrown in a director method
ok = 0
a = MyFoo4()
b = launder(a)
try:
b.pong()
raise RuntimeError("Exception was not thrown")
except TypeError as e:
if str(e).startswith("type() takes 1 or 3 arguments"):
ok = 1
else:
print "Unexpected error message: %s" % str(e)
if not ok:
raise RuntimeError
if not str(e).startswith("type() takes 1 or 3 arguments"):
raise RuntimeError("Unexpected error message: %s" % str(e))
# This is expected to fail with -builtin option

4
Examples/test-suite/python/director_extend_runme.py
View file

@ -17,6 +17,6 @@ class MyObject(SpObject):
m = MyObject()
if m.dummy() != 666:
raise RuntimeError, "1st call"
raise RuntimeError("1st call")
if m.dummy() != 666: # Locked system
raise RuntimeError, "2nd call"
raise RuntimeError("2nd call")

2
Examples/test-suite/python/director_frob_runme.py
View file

@ -4,4 +4,4 @@ foo = Bravo()
s = foo.abs_method()
if s != "Bravo::abs_method()":
raise RuntimeError, s
raise RuntimeError(s)

4
Examples/test-suite/python/director_nested_runme.py
View file

@ -14,7 +14,7 @@ class A(FooBar_int):
a = A()
if a.step() != "Bar::step;Foo::advance;Bar::do_advance;A::do_step;":
raise RuntimeError, "Bad A virtual resolution"
raise RuntimeError("Bad A virtual resolution")
class B(FooBar_int):
@ -34,7 +34,7 @@ class B(FooBar_int):
b = B()
if b.step() != "Bar::step;Foo::advance;B::do_advance;B::do_step;":
raise RuntimeError, "Bad B virtual resolution"
raise RuntimeError("Bad B virtual resolution")
class C(FooBar_int):

2
Examples/test-suite/python/director_profile_runme.py
View file

@ -38,4 +38,4 @@ while i:
a = fi(a) # 20
i -= 1
print a
print("a: {}".format(a))

30
Examples/test-suite/python/director_protected_runme.py
View file

@ -35,7 +35,7 @@ try:
raise RuntimeError
pass
except:
raise RuntimeError, "bad FooBar::used"
raise RuntimeError("bad FooBar::used")
try:
s = fb2.used()
@ -43,7 +43,7 @@ try:
raise RuntimeError
pass
except:
raise RuntimeError, "bad FooBar2::used"
raise RuntimeError("bad FooBar2::used")
try:
s = b.pong()
@ -51,7 +51,7 @@ try:
raise RuntimeError
pass
except:
raise RuntimeError, "bad Bar::pong"
raise RuntimeError("bad Bar::pong")
try:
s = f.pong()
@ -59,7 +59,7 @@ try:
raise RuntimeError
pass
except:
raise RuntimeError, " bad Foo::pong"
raise RuntimeError(" bad Foo::pong")
try:
s = fb.pong()
@ -67,7 +67,7 @@ try:
raise RuntimeError
pass
except:
raise RuntimeError, " bad FooBar::pong"
raise RuntimeError(" bad FooBar::pong")
protected = 1
try:
@ -76,7 +76,7 @@ try:
except:
pass
if not protected:
raise RuntimeError, "Foo::ping is protected"
raise RuntimeError("Foo::ping is protected")
protected = 1
try:
@ -85,7 +85,7 @@ try:
except:
pass
if not protected:
raise RuntimeError, "Foo::ping is protected"
raise RuntimeError("Foo::ping is protected")
protected = 1
@ -95,7 +95,7 @@ try:
except:
pass
if not protected:
raise RuntimeError, "FooBar::pang is protected"
raise RuntimeError("FooBar::pang is protected")
protected = 1
@ -105,7 +105,7 @@ try:
except:
pass
if not protected:
raise RuntimeError, "Bar::cheer is protected"
raise RuntimeError("Bar::cheer is protected")
protected = 1
try:
@ -114,19 +114,19 @@ try:
except:
pass
if not protected:
raise RuntimeError, "Foo::cheer is protected"
raise RuntimeError("Foo::cheer is protected")
if fb3.cheer() != "FooBar3::cheer();":
raise RuntimeError, "bad fb3::cheer"
raise RuntimeError("bad fb3::cheer")
if fb2.callping() != "FooBar2::ping();":
raise RuntimeError, "bad fb2.callping"
raise RuntimeError("bad fb2.callping")
if fb2.callcheer() != "FooBar2::pang();Bar::pong();Foo::pong();FooBar2::ping();":
raise RuntimeError, "bad fb2.callcheer"
raise RuntimeError("bad fb2.callcheer")
if fb3.callping() != "Bar::ping();":
raise RuntimeError, "bad fb3.callping"
raise RuntimeError("bad fb3.callping")
if fb3.callcheer() != "FooBar3::cheer();":
raise RuntimeError, "bad fb3.callcheer"
raise RuntimeError("bad fb3.callcheer")

2
Examples/test-suite/python/director_smartptr_runme.py
View file

@ -31,7 +31,7 @@ class director_smartptr_MyBarFooDerived(FooDerived):
def check(got, expected):
if (got != expected):
raise RuntimeError, "Failed, got: " + got + " expected: " + expected
raise RuntimeError("Failed, got: " + got + " expected: " + expected)
fooBar = FooBar()

6
Examples/test-suite/python/director_string_runme.py
View file

@ -18,12 +18,10 @@ b = B("hello")
b.get(0)
if b.get_first() != "hello world!":
print b.get_first()
raise RuntimeError
raise RuntimeError("b.get_first(): {}".format(b.get_first()))
b.call_process_func()
if b.smem != "hello":
print smem
raise RuntimeError
raise RuntimeError("smem: {}".format(smem))

3
Examples/test-suite/python/director_thread_runme.py
View file

@ -14,7 +14,6 @@ d = Derived()
d.run()
if d.val >= 0:
print d.val
raise RuntimeError
raise RuntimeError("d.val: {}".format(d.val))
d.stop()

3
Examples/test-suite/python/director_unroll_runme.py
View file

@ -16,5 +16,4 @@ c = b.get()
if not (a.this == c.this):
print a, c
raise RuntimeError
raise RuntimeError("{} {}".format(a, c))

14
Examples/test-suite/python/director_wstring_runme.py
View file

@ -7,22 +7,20 @@ class B(A):
A.__init__(self, string)
def get_first(self):
return A.get_first(self) + u" world!"
return A.get_first(self) + " world!"
def process_text(self, s):
self.smem = s
b = B(u"hello")
b = B("hello")
b.get(0)
if b.get_first() != u"hello world!":
print b.get_first()
raise RuntimeError
if b.get_first() != "hello world!":
raise RuntimeError("b.get_first(): {}".format(b.get_first()))
b.call_process_func()
if b.smem != u"hello":
print smem
raise RuntimeError
if b.smem != "hello":
raise RuntimeError("smem: {}".format(smem))

2
Examples/test-suite/python/dynamic_cast_runme.py
View file

@ -8,4 +8,4 @@ y = b.blah()
a = dynamic_cast.do_test(y)
if a != "Bar::test":
print "Failed!!"
raise RuntimeError("Failed!!")

21
Examples/test-suite/python/exception_order_runme.py
View file

@ -9,36 +9,35 @@ a = A()
try:
a.foo()
except E1, e:
except E1 as e:
pass
except:
raise RuntimeError, "bad exception order"
raise RuntimeError("bad exception order")
try:
a.bar()
except E2, e:
except E2 as e:
pass
except:
raise RuntimeError, "bad exception order"
raise RuntimeError("bad exception order")
try:
a.foobar()
except RuntimeError, e:
except RuntimeError as e:
if e.args[0] != "postcatch unknown":
print "bad exception order",
raise RuntimeError, e.args
raise RuntimeError("bad exception order {}".format(e.args))
try:
a.barfoo(1)
except E1, e:
except E1 as e:
pass
except:
raise RuntimeError, "bad exception order"
raise RuntimeError("bad exception order")
try:
a.barfoo(2)
except E2, e:
except E2 as e:
pass
except:
raise RuntimeError, "bad exception order"
raise RuntimeError("bad exception order")

2
Examples/test-suite/python/fvirtual_runme.py
View file

@ -5,4 +5,4 @@ n = Node()
i = sw.addChild(n)
if i != 2:
raise RuntimeError, "addChild"
raise RuntimeError("addChild")

10
Examples/test-suite/python/global_functions_runme.py
View file

@ -11,7 +11,7 @@ check(global_two(2, 2), 4)
fail = True
try:
global_void(1)
except TypeError, e:
except TypeError as e:
fail = False
if fail:
raise RuntimeError("argument count check failed")
@ -19,7 +19,7 @@ if fail:
fail = True
try:
global_one()
except TypeError, e:
except TypeError as e:
fail = False
if fail:
raise RuntimeError("argument count check failed")
@ -27,7 +27,7 @@ if fail:
fail = True
try:
global_one(2, 2)
except TypeError, e:
except TypeError as e:
fail = False
if fail:
@ -36,7 +36,7 @@ if fail:
fail = True
try:
global_two(1)
except TypeError, e:
except TypeError as e:
fail = False
if fail:
@ -45,7 +45,7 @@ if fail:
fail = True
try:
global_two(3, 3, 3)
except TypeError, e:
except TypeError as e:
fail = False
if fail:

4
Examples/test-suite/python/global_vars_runme.py
View file

@ -20,7 +20,7 @@ if x != 9876:
fail = True
try:
global_vars.cvar.notexist = "something"
except AttributeError, e:
except AttributeError as e:
fail = False
if fail:
raise RuntimeError("AttributeError should have been thrown")
@ -28,7 +28,7 @@ if fail:
fail = True
try:
g = global_vars.cvar.notexist
except AttributeError, e:
except AttributeError as e:
fail = False
if fail:
raise RuntimeError("AttributeError should have been thrown")

2
Examples/test-suite/python/import_stl_runme.py
View file

@ -3,4 +3,4 @@ import import_stl_a
v_new = import_stl_b.process_vector([1, 2, 3])
if v_new != (1, 2, 3, 4):
raise RuntimeError, v_new
raise RuntimeError(v_new)

18
Examples/test-suite/python/inctest_runme.py
View file

@ -1,31 +1,21 @@
import inctest
error = 0
try:
a = inctest.A()
except:
print "didn't find A"
print "therefore, I didn't include 'testdir/subdir1/hello.i'"
error = 1
raise RuntimeError("didn't find A, therefore, I didn't include 'testdir/subdir1/hello.i'")
pass
try:
b = inctest.B()
except:
print "didn't find B"
print "therefore, I didn't include 'testdir/subdir2/hello.i'"
error = 1
raise RuntimeError("didn't find B, therefore, I didn't include 'testdir/subdir2/hello.i'")
pass
if error == 1:
raise RuntimeError
# Check the import in subdirectory worked
if inctest.importtest1(5) != 15:
print "import test 1 failed"
raise RuntimeError
raise RuntimeError("import test 1 failed")
if inctest.importtest2("black") != "white":
print "import test 2 failed"
raise RuntimeError
raise RuntimeError("import test 2 failed")

6
Examples/test-suite/python/inherit_missing_runme.py
View file

@ -6,14 +6,14 @@ c = inherit_missing.Spam()
x = inherit_missing.do_blah(a)
if x != "Foo::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))
x = inherit_missing.do_blah(b)
if x != "Bar::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))
x = inherit_missing.do_blah(c)
if x != "Spam::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))
inherit_missing.delete_Foo(a)

3
Examples/test-suite/python/inplaceadd_runme.py
View file

@ -3,8 +3,7 @@ a = inplaceadd.A(7)
a += 5
if a.val != 12:
print a.val
raise RuntimeError
raise RuntimeError("a.val: {}".format(a.val))
a -= 5
if a.val != 7:

8
Examples/test-suite/python/li_attribute_runme.py
View file

@ -8,12 +8,10 @@ if aa.a != 1:
raise RuntimeError
aa.a = 3
if aa.a != 3:
print aa.a
raise RuntimeError
raise RuntimeError("aa.a: {}".format(aa.a))
if aa.b != 2:
print aa.b
raise RuntimeError
raise RuntimeError("aa.b: {}".format(aa.b))
aa.b = 5
if aa.b != 5:
raise RuntimeError
@ -77,7 +75,7 @@ if myStringyClass.ReadOnlyString != "changed string":
try:
x = myFoo.does_not_exist
raise RuntimeError
except AttributeError, e:
except AttributeError as e:
if str(e).find("does_not_exist") == -1:
raise RuntimeError

3
Examples/test-suite/python/li_attribute_template_runme.py
View file

@ -7,8 +7,7 @@ chell = li_attribute_template.Cintint(1, 2, 3)
def rassert(what, master):
if what != master:
print what
raise RuntimeError
raise RuntimeError("what: {}".format(what))
# Testing primitive by value attribute
rassert(chell.a, 1)

4
Examples/test-suite/python/li_boost_shared_ptr_runme.py
View file

@ -10,7 +10,7 @@ class li_boost_shared_ptr_runme:
def main(self):
if (debug):
print "Started"
print("Started")
li_boost_shared_ptr.cvar.debug_shared = debug
@ -32,7 +32,7 @@ class li_boost_shared_ptr_runme:
"shared_ptr wrapper count=%s" % wrapper_count)
if (debug):
print "Finished"
print("Finished")
def runtest(self):
# simple shared_ptr usage - created in C++

6
Examples/test-suite/python/li_cstring_runme.py
View file

@ -11,12 +11,10 @@ if test2() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^
raise RuntimeError
if test3("hello") != "hello-suffix":
print test3("hello")
raise RuntimeError
raise RuntimeError("test3(\"hello\")")
if test4("hello") != "hello-suffix":
print test4("hello")
raise RuntimeError
raise RuntimeError("test4(\"hello\")")
if test5(4) != "xxxx":
raise RuntimeError

18
Examples/test-suite/python/li_cwstring_runme.py
View file

@ -1,28 +1,28 @@
from li_cwstring import *
if count(u"ab\0ab\0ab\0", 0) != 3:
if count("ab\0ab\0ab\0", 0) != 3:
raise RuntimeError
if test1() != u"Hello World":
if test1() != "Hello World":
raise RuntimeError
if test2() != u" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_":
if test2() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_":
raise RuntimeError
if test3("hello") != u"hello-suffix":
if test3("hello") != "hello-suffix":
raise RuntimeError
if test4("hello") != u"hello-suffix":
if test4("hello") != "hello-suffix":
raise RuntimeError
if test5(4) != u"xxxx":
if test5(4) != "xxxx":
raise RuntimeError
if test6(10) != u"xxxxx":
if test6(10) != "xxxxx":
raise RuntimeError
if test7() != u"Hello world!":
if test7() != "Hello world!":
raise RuntimeError
if test8() != u" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_":
if test8() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_":
raise RuntimeError

6
Examples/test-suite/python/li_implicit_runme.py
View file

@ -9,8 +9,8 @@ ad, get(ad)
ab, get(ab)
if get(ai) != get(1):
raise RuntimeError, "bad implicit type"
raise RuntimeError("bad implicit type")
if get(ad) != get(2.0):
raise RuntimeError, "bad implicit type"
raise RuntimeError("bad implicit type")
if get(ab) != get(b):
raise RuntimeError, "bad implicit type"
raise RuntimeError("bad implicit type")

40
Examples/test-suite/python/li_std_containers_int_runme.py
View file

@ -6,7 +6,7 @@ import sys
def failed(a, b, msg):
raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b))
raise RuntimeError(msg + " " + str(list(a)) + " " + str(list(b)))
def compare_sequences(a, b):
@ -26,7 +26,7 @@ def compare_containers(pythonlist, swigvector, swiglist):
def container_insert_step(i, j, step, newval):
ps = range(6)
ps = list(range(6))
iv = vector_int(ps)
il = list_int(ps)
@ -43,9 +43,9 @@ def container_insert_step(i, j, step, newval):
else:
ps[i:j:step] = newval
ps_error = None
except ValueError, e:
except ValueError as e:
ps_error = e
except IndexError, e:
except IndexError as e:
ps_error = e
# std::vector<int>
@ -61,9 +61,9 @@ def container_insert_step(i, j, step, newval):
else:
iv[i:j:step] = newval
iv_error = None
except ValueError, e:
except ValueError as e:
iv_error = e
except IndexError, e:
except IndexError as e:
iv_error = e
# std::list<int>
@ -79,14 +79,14 @@ def container_insert_step(i, j, step, newval):
else:
il[i:j:step] = newval
il_error = None
except ValueError, e:
except ValueError as e:
il_error = e
except IndexError, e:
except IndexError as e:
il_error = e
if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
raise RuntimeError, "ValueError exception not consistently thrown: " + \
str(ps_error) + " " + str(iv_error) + " " + str(il_error)
raise RuntimeError("ValueError exception not consistently thrown: " + \
str(ps_error) + " " + str(iv_error) + " " + str(il_error))
compare_containers(ps, iv, il)
@ -94,7 +94,7 @@ def container_insert_step(i, j, step, newval):
# Check std::vector and std::list delete behaves same as Python list
# delete including exceptions
def container_delete_step(i, j, step):
ps = range(6)
ps = list(range(6))
iv = vector_int(ps)
il = list_int(ps)
@ -111,9 +111,9 @@ def container_delete_step(i, j, step):
else:
del ps[i:j:step]
ps_error = None
except ValueError, e:
except ValueError as e:
ps_error = e
except IndexError, e:
except IndexError as e:
ps_error = e
# std::vector<int>
@ -129,9 +129,9 @@ def container_delete_step(i, j, step):
else:
del iv[i:j:step]
iv_error = None
except ValueError, e:
except ValueError as e:
iv_error = e
except IndexError, e:
except IndexError as e:
iv_error = e
# std::list<int>
@ -147,14 +147,14 @@ def container_delete_step(i, j, step):
else:
del il[i:j:step]
il_error = None
except ValueError, e:
except ValueError as e:
il_error = e
except IndexError, e:
except IndexError as e:
il_error = e
if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
raise RuntimeError, "ValueError exception not consistently thrown: " + \
str(ps_error) + " " + str(iv_error) + " " + str(il_error)
raise RuntimeError("ValueError exception not consistently thrown: " + \
str(ps_error) + " " + str(iv_error) + " " + str(il_error))
compare_containers(ps, iv, il)
@ -252,7 +252,7 @@ for start in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 10
for step in range(-7, 7):
container_delete_step(start, end, step)
ps = range(6)
ps = list(range(6))
iv = vector_int(ps)
il = list_int(ps)
del ps[:]

19
Examples/test-suite/python/li_std_map_runme.py
View file

@ -25,8 +25,7 @@ for k in m:
for k in m:
if pm[k].this != m[k].this:
print pm[k], m[k]
raise RuntimeError
raise RuntimeError("Not equal {} {}".format(pm[k], m[k]))
m = {}
@ -51,31 +50,31 @@ mii[1] = 2
if mii[1] != 2:
raise RuntimeError
if mii.keys() != [1]:
if list(mii.keys()) != [1]:
raise RuntimeError("keys")
if mii.values() != [2]:
if list(mii.values()) != [2]:
raise RuntimeError("values")
if mii.items() != [(1, 2)]:
if list(mii.items()) != [(1, 2)]:
raise RuntimeError("items")
if [k for k in mii] != [1]:
raise RuntimeError("iteration")
if [i for i in mii.iterkeys()] != [1]:
if [i for i in mii.keys()] != [1]:
raise RuntimeError("iterkeys")
if [i for i in mii.itervalues()] != [2]:
if [i for i in mii.values()] != [2]:
raise RuntimeError("itervalues")
if [i for i in mii.iteritems()] != [(1, 2)]:
if [i for i in mii.items()] != [(1, 2)]:
raise RuntimeError("iteritems")
slmap = li_std_map.StringLengthNumberMap()
li_std_map.populate(slmap)
keys = " ".join([k for k in slmap.keys()])
keys = " ".join([k for k in list(slmap.keys())])
if keys != "a aa zzz xxxx aaaaa":
raise RuntimeError("Keys are wrong or in wrong order: " + keys)
values = " ".join([str(v) for v in slmap.values()])
values = " ".join([str(v) for v in list(slmap.values())])
if values != "1 2 3 4 5":
raise RuntimeError("Values are wrong or in wrong order: " + values)

20
Examples/test-suite/python/li_std_set_runme.py
View file

@ -14,11 +14,11 @@ if sum != "abc":
raise RuntimeError
i = s.__iter__()
if i.next() != "a":
if next(i) != "a":
raise RuntimeError
if i.next() != "b":
if next(i) != "b":
raise RuntimeError
if i.next() != "c":
if next(i) != "c":
raise RuntimeError
@ -26,7 +26,7 @@ b = s.begin()
e = s.end()
sum = ""
while (b != e):
sum = sum + b.next()
sum = sum + next(b)
if sum != "abc":
raise RuntimeError
@ -34,7 +34,7 @@ b = s.rbegin()
e = s.rend()
sum = ""
while (b != e):
sum = sum + b.next()
sum = sum + next(b)
if sum != "cba":
raise RuntimeError
@ -47,25 +47,25 @@ si.append(2)
si.append(3)
i = si.__iter__()
if i.next() != 1:
if next(i) != 1:
raise RuntimeError
if i.next() != 2:
if next(i) != 2:
raise RuntimeError
if i.next() != 3:
if next(i) != 3:
raise RuntimeError
if si[0] != 1:
raise RuntimeError
i = s.begin()
i.next()
next(i)
s.erase(i)
b = s.begin()
e = s.end()
sum = ""
while (b != e):
sum = sum + b.next()
sum = sum + next(b)
if sum != "ac":
raise RuntimeError

3
Examples/test-suite/python/li_std_stream_runme.py
View file

@ -9,5 +9,4 @@ o << a << " " << 2345 << " " << 1.435
if o.str() != "A class 2345 1.435":
print "\"%s\"" % (o.str(),)
raise RuntimeError
raise RuntimeError("str failed: \"%s\"".format(o.str()))

67
Examples/test-suite/python/li_std_string_extra_runme.py
View file

@ -4,17 +4,16 @@ x = "hello"
if li_std_string_extra.test_ccvalue(x) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_cvalue(x) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_value(x) != x:
print x, li_std_string_extra.test_value(x)
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping {} {}".format(x, li_std_string_extra.test_value(x)))
if li_std_string_extra.test_const_reference(x) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
s = li_std_string_extra.string("he")
@ -23,45 +22,43 @@ s = li_std_string_extra.string("he")
s = s + "llo"
if s != x:
print s, x
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping {} {}".format(s, x))
if s[1:4] != x[1:4]:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_value(s) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_const_reference(s) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
a = li_std_string_extra.A(s)
if li_std_string_extra.test_value(a) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_const_reference(a) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
b = li_std_string_extra.string(" world")
s = a + b
if a + b != "hello world":
print a + b
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping {}".format(a + b))
if a + " world" != "hello world":
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
# This is expected to fail with -builtin option
# Reverse operators not supported in builtin types
if not li_std_string_extra.is_python_builtin():
if "hello" + b != "hello world":
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
c = "hello" + b
if c.find_last_of("l") != 9:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
s = "hello world"
@ -69,33 +66,33 @@ b = li_std_string_extra.B("hi")
b.name = li_std_string_extra.string("hello")
if b.name != "hello":
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
b.a = li_std_string_extra.A("hello")
if b.a != "hello":
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_value_basic1(x) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_value_basic2(x) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_value_basic3(x) != x:
raise RuntimeError, "bad string mapping"
raise RuntimeError("bad string mapping")
if li_std_string_extra.test_value_basic_overload(x) != x:
raise RuntimeError, "bad overload string"
raise RuntimeError("bad overload string")
if li_std_string_extra.test_value_basic_overload(123) != "int":
raise RuntimeError, "bad overload int"
raise RuntimeError("bad overload int")
try:
li_std_string_extra.test_value_basic_overload([x])
raise RuntimeError, "should throw TypeError"
raise RuntimeError("should throw TypeError")
except TypeError as e:
if str(e).find("Possible C/C++ prototypes are:") == -1:
raise RuntimeError("Incorrect error message text:\n{}".format(e))
@ -103,7 +100,7 @@ except TypeError as e:
try:
li_std_string_extra.test_value_basic_overload([123])
raise RuntimeError, "should throw TypeError"
raise RuntimeError("should throw TypeError")
except TypeError as e:
if str(e).find("Possible C/C++ prototypes are:") == -1:
raise RuntimeError("Incorrect error message text:\n{}".format(e))
@ -112,30 +109,30 @@ except TypeError as e:
# Global variables
s = "initial string"
if li_std_string_extra.cvar.GlobalString2 != "global string 2":
raise RuntimeError, "GlobalString2 test 1"
raise RuntimeError("GlobalString2 test 1")
li_std_string_extra.cvar.GlobalString2 = s
if li_std_string_extra.cvar.GlobalString2 != s:
raise RuntimeError, "GlobalString2 test 2"
raise RuntimeError("GlobalString2 test 2")
if li_std_string_extra.cvar.ConstGlobalString != "const global string":
raise RuntimeError, "ConstGlobalString test"
raise RuntimeError("ConstGlobalString test")
# Member variables
myStructure = li_std_string_extra.Structure()
if myStructure.MemberString2 != "member string 2":
raise RuntimeError, "MemberString2 test 1"
raise RuntimeError("MemberString2 test 1")
myStructure.MemberString2 = s
if myStructure.MemberString2 != s:
raise RuntimeError, "MemberString2 test 2"
raise RuntimeError("MemberString2 test 2")
if myStructure.ConstMemberString != "const member string":
raise RuntimeError, "ConstMemberString test"
raise RuntimeError("ConstMemberString test")
if li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2":
raise RuntimeError, "StaticMemberString2 test 1"
raise RuntimeError("StaticMemberString2 test 1")
li_std_string_extra.cvar.Structure_StaticMemberString2 = s
if li_std_string_extra.cvar.Structure_StaticMemberString2 != s:
raise RuntimeError, "StaticMemberString2 test 2"
raise RuntimeError("StaticMemberString2 test 2")
if li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string":
raise RuntimeError, "ConstStaticMemberString test"
raise RuntimeError("ConstStaticMemberString test")
if li_std_string_extra.test_reference_input("hello") != "hello":

2
Examples/test-suite/python/li_std_vector_enum_runme.py
View file

@ -14,7 +14,7 @@ check(ev.nums[2], 30)
it = ev.nums.iterator()
v = it.value()
check(v, 10)
it.next()
next(it)
v = it.value()
check(v, 20)

30
Examples/test-suite/python/li_std_vector_extra_runme.py
View file

@ -23,20 +23,20 @@ bv[2] = bool(4)
bv[3] = bool(0)
if bv[0] != bv[2]:
raise RuntimeError, "bad std::vector<bool> mapping"
raise RuntimeError("bad std::vector<bool> mapping")
b = B(5)
va = VecA([b, None, b, b])
if va[0].f(1) != 6:
raise RuntimeError, "bad std::vector<A*> mapping"
raise RuntimeError("bad std::vector<A*> mapping")
if vecAptr(va) != 6:
raise RuntimeError, "bad std::vector<A*> mapping"
raise RuntimeError("bad std::vector<A*> mapping")
b.val = 7
if va[3].f(1) != 8:
raise RuntimeError, "bad std::vector<A*> mapping"
raise RuntimeError("bad std::vector<A*> mapping")
ip = PtrInt()
@ -47,7 +47,7 @@ ArrInt_setitem(ap, 2, 123)
vi = IntPtrVector((ip, ap, None))
if ArrInt_getitem(vi[0], 0) != ArrInt_getitem(vi[1], 2):
raise RuntimeError, "bad std::vector<int*> mapping"
raise RuntimeError("bad std::vector<int*> mapping")
delete_ArrInt(ap)
@ -57,42 +57,42 @@ a = halfs([10, 8, 4, 3])
v = IntVector()
v[0:2] = [1, 2]
if v[0] != 1 or v[1] != 2:
raise RuntimeError, "bad setslice"
raise RuntimeError("bad setslice")
if v[0:-1][0] != 1:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
if v[0:-2].size() != 0:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
v[0:1] = [2]
if v[0] != 2:
raise RuntimeError, "bad setslice"
raise RuntimeError("bad setslice")
v[1:] = [3]
if v[1] != 3:
raise RuntimeError, "bad setslice"
raise RuntimeError("bad setslice")
v[2:] = [3]
if v[2] != 3:
raise RuntimeError, "bad setslice"
raise RuntimeError("bad setslice")
if v[0:][0] != v[0]:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
del v[:]
if v.size() != 0:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
del v[:]
if v.size() != 0:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
v = vecStr(["hello ", "world"])
if v[0] != "hello world":
raise RuntimeError, "bad std::string+std::vector"
raise RuntimeError("bad std::string+std::vector")
pv = pyvector([1, "hello", (1, 2)])

5
Examples/test-suite/python/li_std_wstream_runme.py
View file

@ -5,8 +5,7 @@ a = A()
o = wostringstream()
o << a << u" " << 2345 << u" " << 1.435 << wends
o << a << " " << 2345 << " " << 1.435 << wends
if o.str() != "A class 2345 1.435\0":
print "\"%s\"" % (o.str(),)
raise RuntimeError
raise RuntimeError("str failed: \"%s\"".format(o.str()))

13
Examples/test-suite/python/li_std_wstring_inherit_runme.py
View file

@ -1,14 +1,13 @@
import li_std_wstring_inherit
import sys
x = u"hello"
x = "hello"
s = li_std_wstring_inherit.wstring(u"he")
s = s + u"llo"
s = li_std_wstring_inherit.wstring("he")
s = s + "llo"
if s != x:
print s, x
raise RuntimeError("bad string mapping")
raise RuntimeError("bad string mapping {} {}".format(s, x))
if s[1:4] != x[1:4]:
raise RuntimeError("bad string mapping")
@ -34,12 +33,12 @@ if not li_std_wstring_inherit.is_python_builtin():
b = li_std_wstring_inherit.B("hi")
b.name = li_std_wstring_inherit.wstring(u"hello")
b.name = li_std_wstring_inherit.wstring("hello")
if b.name != "hello":
raise RuntimeError("bad string mapping")
b.a = li_std_wstring_inherit.A("hello")
if b.a != u"hello":
if b.a != "hello":
raise RuntimeError("bad string mapping")

6
Examples/test-suite/python/li_std_wstring_runme.py
View file

@ -5,10 +5,10 @@ def check_equal(a, b):
if a != b:
raise RuntimeError("failed {} {}".format(a, b))
h = u"h"
h = "h"
check_equal(li_std_wstring.test_wcvalue(h), h)
x = u"abc"
x = "abc"
check_equal(li_std_wstring.test_ccvalue(x), x)
check_equal(li_std_wstring.test_cvalue(x), x)
@ -72,7 +72,7 @@ except TypeError:
# Check surrogateescape
if sys.version_info[0:2] > (3, 1):
x = u"h\udce9llo" # surrogate escaped representation of C char*: "h\xe9llo"
x = "h\udce9llo" # surrogate escaped representation of C char*: "h\xe9llo"
if li_std_wstring.non_utf8_c_str() != x:
raise RuntimeError("surrogateescape not working")
if li_std_wstring.size_wstring(x) != 5 and len(x) != 5:

40
Examples/test-suite/python/minherit_runme.py
View file

@ -7,31 +7,31 @@ c = minherit.FooBar()
d = minherit.Spam()
if a.xget() != 1:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if b.yget() != 2:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if c.xget() != 1 or c.yget() != 2 or c.zget() != 3:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if d.xget() != 1 or d.yget() != 2 or d.zget() != 3 or d.wget() != 4:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if minherit.xget(a) != 1:
raise RuntimeError, "Bad attribute value %d" % (minherit.xget(a))
raise RuntimeError("Bad attribute value %d" % (minherit.xget(a)))
if minherit.yget(b) != 2:
raise RuntimeError, "Bad attribute value %d" % (minherit.yget(b))
raise RuntimeError("Bad attribute value %d" % (minherit.yget(b)))
if minherit.xget(c) != 1 or minherit.yget(c) != 2 or minherit.zget(c) != 3:
raise RuntimeError, "Bad attribute value %d %d %d" % (
minherit.xget(c), minherit.yget(c), minherit.zget(c))
raise RuntimeError("Bad attribute value %d %d %d" % (
minherit.xget(c), minherit.yget(c), minherit.zget(c)))
if minherit.xget(d) != 1 or minherit.yget(d) != 2 or minherit.zget(d) != 3 or minherit.wget(d) != 4:
raise RuntimeError, "Bad attribute value %d %d %d %d" % (
minherit.xget(d), minherit.yget(d), minherit.zget(d), minherit.wget(d))
raise RuntimeError("Bad attribute value %d %d %d %d" % (
minherit.xget(d), minherit.yget(d), minherit.zget(d), minherit.wget(d)))
# Cleanse all of the pointers and see what happens
@ -41,27 +41,27 @@ cc = minherit.toFooBarPtr(c)
dd = minherit.toSpamPtr(d)
if aa.xget() != 1:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if bb.yget() != 2:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if cc.xget() != 1 or cc.yget() != 2 or cc.zget() != 3:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if dd.xget() != 1 or dd.yget() != 2 or dd.zget() != 3 or dd.wget() != 4:
raise RuntimeError, "Bad attribute value"
raise RuntimeError("Bad attribute value")
if minherit.xget(aa) != 1:
raise RuntimeError, "Bad attribute value %d" % (minherit.xget(aa))
raise RuntimeError("Bad attribute value %d" % (minherit.xget(aa)))
if minherit.yget(bb) != 2:
raise RuntimeError, "Bad attribute value %d" % (minherit.yget(bb))
raise RuntimeError("Bad attribute value %d" % (minherit.yget(bb)))
if minherit.xget(cc) != 1 or minherit.yget(cc) != 2 or minherit.zget(cc) != 3:
raise RuntimeError, "Bad attribute value %d %d %d" % (
minherit.xget(cc), minherit.yget(cc), minherit.zget(cc))
raise RuntimeError("Bad attribute value %d %d %d" % (
minherit.xget(cc), minherit.yget(cc), minherit.zget(cc)))
if minherit.xget(dd) != 1 or minherit.yget(dd) != 2 or minherit.zget(dd) != 3 or minherit.wget(dd) != 4:
raise RuntimeError, "Bad attribute value %d %d %d %d" % (
minherit.xget(dd), minherit.yget(dd), minherit.zget(dd), minherit.wget(dd))
raise RuntimeError("Bad attribute value %d %d %d %d" % (
minherit.xget(dd), minherit.yget(dd), minherit.zget(dd), minherit.wget(dd)))

4
Examples/test-suite/python/namespace_class_runme.py
View file

@ -7,7 +7,7 @@ except:
error = 0
if (error):
raise RuntimeError, "Private1 is private"
raise RuntimeError("Private1 is private")
try:
p = Private2()
@ -16,7 +16,7 @@ except:
error = 0
if (error):
raise RuntimeError, "Private2 is private"
raise RuntimeError("Private2 is private")
EulerT3D.toFrame(1, 1, 1)

22
Examples/test-suite/python/overload_complicated_runme.py
View file

@ -10,38 +10,38 @@ p = Pop(pInt, False)
# Check overloaded in const only and pointers/references which target
# languages cannot disambiguate
if p.hip(False) != 701:
raise RuntimeError, "Test 1 failed"
raise RuntimeError("Test 1 failed")
if p.hip(pInt) != 702:
raise RuntimeError, "Test 2 failed"
raise RuntimeError("Test 2 failed")
# Reverse the order for the above
if p.hop(pInt) != 805:
raise RuntimeError, "Test 3 failed"
raise RuntimeError("Test 3 failed")
if p.hop(False) != 801:
raise RuntimeError, "Test 4 failed"
raise RuntimeError("Test 4 failed")
# Few more variations and order shuffled
if p.pop(False) != 901:
raise RuntimeError, "Test 5 failed"
raise RuntimeError("Test 5 failed")
if p.pop(pInt) != 904:
raise RuntimeError, "Test 6 failed"
raise RuntimeError("Test 6 failed")
if p.pop() != 905:
raise RuntimeError, "Test 7 failed"
raise RuntimeError("Test 7 failed")
# Overload on const only
if p.bop(pInt) != 1001:
raise RuntimeError, "Test 8 failed"
raise RuntimeError("Test 8 failed")
if p.bip(pInt) != 2002:
raise RuntimeError, "Test 9 failed"
raise RuntimeError("Test 9 failed")
# Globals
if muzak(False) != 3001:
raise RuntimeError, "Test 10 failed"
raise RuntimeError("Test 10 failed")
if muzak(pInt) != 3002:
raise RuntimeError, "Test 11 failed"
raise RuntimeError("Test 11 failed")

50
Examples/test-suite/python/overload_simple_runme.py
View file

@ -1,95 +1,95 @@
from overload_simple import *
if foo(3) != "foo:int":
raise RuntimeError, "foo(int)"
raise RuntimeError("foo(int)")
if foo(3.0) != "foo:double":
raise RuntimeError, "foo(double)"
raise RuntimeError("foo(double)")
if foo("hello") != "foo:char *":
raise RuntimeError, "foo(char *)"
raise RuntimeError("foo(char *)")
f = Foo()
b = Bar()
if foo(f) != "foo:Foo *":
raise RuntimeError, "foo(Foo *)"
raise RuntimeError("foo(Foo *)")
if foo(b) != "foo:Bar *":
raise RuntimeError, "foo(Bar *)"
raise RuntimeError("foo(Bar *)")
v = malloc_void(32)
if foo(v) != "foo:void *":
raise RuntimeError, "foo(void *)"
raise RuntimeError("foo(void *)")
s = Spam()
if s.foo(3) != "foo:int":
raise RuntimeError, "Spam::foo(int)"
raise RuntimeError("Spam::foo(int)")
if s.foo(3.0) != "foo:double":
raise RuntimeError, "Spam::foo(double)"
raise RuntimeError("Spam::foo(double)")
if s.foo("hello") != "foo:char *":
raise RuntimeError, "Spam::foo(char *)"
raise RuntimeError("Spam::foo(char *)")
if s.foo(f) != "foo:Foo *":
raise RuntimeError, "Spam::foo(Foo *)"
raise RuntimeError("Spam::foo(Foo *)")
if s.foo(b) != "foo:Bar *":
raise RuntimeError, "Spam::foo(Bar *)"
raise RuntimeError("Spam::foo(Bar *)")
if s.foo(v) != "foo:void *":
raise RuntimeError, "Spam::foo(void *)"
raise RuntimeError("Spam::foo(void *)")
if Spam_bar(3) != "bar:int":
raise RuntimeError, "Spam::bar(int)"
raise RuntimeError("Spam::bar(int)")
if Spam_bar(3.0) != "bar:double":
raise RuntimeError, "Spam::bar(double)"
raise RuntimeError("Spam::bar(double)")
if Spam_bar("hello") != "bar:char *":
raise RuntimeError, "Spam::bar(char *)"
raise RuntimeError("Spam::bar(char *)")
if Spam_bar(f) != "bar:Foo *":
raise RuntimeError, "Spam::bar(Foo *)"
raise RuntimeError("Spam::bar(Foo *)")
if Spam_bar(b) != "bar:Bar *":
raise RuntimeError, "Spam::bar(Bar *)"
raise RuntimeError("Spam::bar(Bar *)")
if Spam_bar(v) != "bar:void *":
raise RuntimeError, "Spam::bar(void *)"
raise RuntimeError("Spam::bar(void *)")
# Test constructors
s = Spam()
if s.type != "none":
raise RuntimeError, "Spam()"
raise RuntimeError("Spam()")
s = Spam(3)
if s.type != "int":
raise RuntimeError, "Spam(int)"
raise RuntimeError("Spam(int)")
s = Spam(3.4)
if s.type != "double":
raise RuntimeError, "Spam(double)"
raise RuntimeError("Spam(double)")
s = Spam("hello")
if s.type != "char *":
raise RuntimeError, "Spam(char *)"
raise RuntimeError("Spam(char *)")
s = Spam(f)
if s.type != "Foo *":
raise RuntimeError, "Spam(Foo *)"
raise RuntimeError("Spam(Foo *)")
s = Spam(b)
if s.type != "Bar *":
raise RuntimeError, "Spam(Bar *)"
raise RuntimeError("Spam(Bar *)")
s = Spam(v)
if s.type != "void *":
raise RuntimeError, "Spam(void *)"
raise RuntimeError("Spam(void *)")
free_void(v)

4
Examples/test-suite/python/overload_subtype_runme.py
View file

@ -4,7 +4,7 @@ f = Foo()
b = Bar()
if spam(f) != 1:
raise RuntimeError, "foo"
raise RuntimeError("foo")
if spam(b) != 2:
raise RuntimeError, "bar"
raise RuntimeError("bar")

78
Examples/test-suite/python/overload_template_fast_runme.py
View file

@ -7,74 +7,74 @@ b = maximum(3.4, 5.2)
# mix 1
if (mix1("hi") != 101):
raise RuntimeError, ("mix1(const char*)")
raise RuntimeError(("mix1(const char*)"))
if (mix1(1.0, 1.0) != 102):
raise RuntimeError, ("mix1(double, const double &)")
raise RuntimeError(("mix1(double, const double &)"))
if (mix1(1.0) != 103):
raise RuntimeError, ("mix1(double)")
raise RuntimeError(("mix1(double)"))
# mix 2
if (mix2("hi") != 101):
raise RuntimeError, ("mix2(const char*)")
raise RuntimeError(("mix2(const char*)"))
if (mix2(1.0, 1.0) != 102):
raise RuntimeError, ("mix2(double, const double &)")
raise RuntimeError(("mix2(double, const double &)"))
if (mix2(1.0) != 103):
raise RuntimeError, ("mix2(double)")
raise RuntimeError(("mix2(double)"))
# mix 3
if (mix3("hi") != 101):
raise RuntimeError, ("mix3(const char*)")
raise RuntimeError(("mix3(const char*)"))
if (mix3(1.0, 1.0) != 102):
raise RuntimeError, ("mix3(double, const double &)")
raise RuntimeError(("mix3(double, const double &)"))
if (mix3(1.0) != 103):
raise RuntimeError, ("mix3(double)")
raise RuntimeError(("mix3(double)"))
# Combination 1
if (overtparams1(100) != 10):
raise RuntimeError, ("overtparams1(int)")
raise RuntimeError(("overtparams1(int)"))
if (overtparams1(100.0, 100) != 20):
raise RuntimeError, ("overtparams1(double, int)")
raise RuntimeError(("overtparams1(double, int)"))
# Combination 2
if (overtparams2(100.0, 100) != 40):
raise RuntimeError, ("overtparams2(double, int)")
raise RuntimeError(("overtparams2(double, int)"))
# Combination 3
if (overloaded() != 60):
raise RuntimeError, ("overloaded()")
raise RuntimeError(("overloaded()"))
if (overloaded(100.0, 100) != 70):
raise RuntimeError, ("overloaded(double, int)")
raise RuntimeError(("overloaded(double, int)"))
# Combination 4
if (overloadedagain("hello") != 80):
raise RuntimeError, ("overloadedagain(const char *)")
raise RuntimeError(("overloadedagain(const char *)"))
if (overloadedagain() != 90):
raise RuntimeError, ("overloadedagain(double)")
raise RuntimeError(("overloadedagain(double)"))
# specializations
if (specialization(10) != 202):
raise RuntimeError, ("specialization(int)")
raise RuntimeError(("specialization(int)"))
if (specialization(10.0) != 203):
raise RuntimeError, ("specialization(double)")
raise RuntimeError(("specialization(double)"))
if (specialization(10, 10) != 204):
raise RuntimeError, ("specialization(int, int)")
raise RuntimeError(("specialization(int, int)"))
if (specialization(10.0, 10.0) != 205):
raise RuntimeError, ("specialization(double, double)")
raise RuntimeError(("specialization(double, double)"))
if (specialization("hi", "hi") != 201):
raise RuntimeError, ("specialization(const char *, const char *)")
raise RuntimeError(("specialization(const char *, const char *)"))
# simple specialization
@ -84,61 +84,61 @@ xyz_double()
# a bit of everything
if (overload("hi") != 0):
raise RuntimeError, ("overload()")
raise RuntimeError(("overload()"))
if (overload(1) != 10):
raise RuntimeError, ("overload(int t)")
raise RuntimeError(("overload(int t)"))
if (overload(1, 1) != 20):
raise RuntimeError, ("overload(int t, const int &)")
raise RuntimeError(("overload(int t, const int &)"))
if (overload(1, "hello") != 30):
raise RuntimeError, ("overload(int t, const char *)")
raise RuntimeError(("overload(int t, const char *)"))
k = Klass()
if (overload(k) != 10):
raise RuntimeError, ("overload(Klass t)")
raise RuntimeError(("overload(Klass t)"))
if (overload(k, k) != 20):
raise RuntimeError, ("overload(Klass t, const Klass &)")
raise RuntimeError(("overload(Klass t, const Klass &)"))
if (overload(k, "hello") != 30):
raise RuntimeError, ("overload(Klass t, const char *)")
raise RuntimeError(("overload(Klass t, const char *)"))
if (overload(10.0, "hi") != 40):
raise RuntimeError, ("overload(double t, const char *)")
raise RuntimeError(("overload(double t, const char *)"))
if (overload() != 50):
raise RuntimeError, ("overload(const char *)")
raise RuntimeError(("overload(const char *)"))
# everything put in a namespace
if (nsoverload("hi") != 1000):
raise RuntimeError, ("nsoverload()")
raise RuntimeError(("nsoverload()"))
if (nsoverload(1) != 1010):
raise RuntimeError, ("nsoverload(int t)")
raise RuntimeError(("nsoverload(int t)"))
if (nsoverload(1, 1) != 1020):
raise RuntimeError, ("nsoverload(int t, const int &)")
raise RuntimeError(("nsoverload(int t, const int &)"))
if (nsoverload(1, "hello") != 1030):
raise RuntimeError, ("nsoverload(int t, const char *)")
raise RuntimeError(("nsoverload(int t, const char *)"))
if (nsoverload(k) != 1010):
raise RuntimeError, ("nsoverload(Klass t)")
raise RuntimeError(("nsoverload(Klass t)"))
if (nsoverload(k, k) != 1020):
raise RuntimeError, ("nsoverload(Klass t, const Klass &)")
raise RuntimeError(("nsoverload(Klass t, const Klass &)"))
if (nsoverload(k, "hello") != 1030):
raise RuntimeError, ("nsoverload(Klass t, const char *)")
raise RuntimeError(("nsoverload(Klass t, const char *)"))
if (nsoverload(10.0, "hi") != 1040):
raise RuntimeError, ("nsoverload(double t, const char *)")
raise RuntimeError(("nsoverload(double t, const char *)"))
if (nsoverload() != 1050):
raise RuntimeError, ("nsoverload(const char *)")
raise RuntimeError(("nsoverload(const char *)"))
A.foo(1)

78
Examples/test-suite/python/overload_template_runme.py
View file

@ -6,74 +6,74 @@ b = maximum(3.4, 5.2)
# mix 1
if (mix1("hi") != 101):
raise RuntimeError, ("mix1(const char*)")
raise RuntimeError(("mix1(const char*)"))
if (mix1(1.0, 1.0) != 102):
raise RuntimeError, ("mix1(double, const double &)")
raise RuntimeError(("mix1(double, const double &)"))
if (mix1(1.0) != 103):
raise RuntimeError, ("mix1(double)")
raise RuntimeError(("mix1(double)"))
# mix 2
if (mix2("hi") != 101):
raise RuntimeError, ("mix2(const char*)")
raise RuntimeError(("mix2(const char*)"))
if (mix2(1.0, 1.0) != 102):
raise RuntimeError, ("mix2(double, const double &)")
raise RuntimeError(("mix2(double, const double &)"))
if (mix2(1.0) != 103):
raise RuntimeError, ("mix2(double)")
raise RuntimeError(("mix2(double)"))
# mix 3
if (mix3("hi") != 101):
raise RuntimeError, ("mix3(const char*)")
raise RuntimeError(("mix3(const char*)"))
if (mix3(1.0, 1.0) != 102):
raise RuntimeError, ("mix3(double, const double &)")
raise RuntimeError(("mix3(double, const double &)"))
if (mix3(1.0) != 103):
raise RuntimeError, ("mix3(double)")
raise RuntimeError(("mix3(double)"))
# Combination 1
if (overtparams1(100) != 10):
raise RuntimeError, ("overtparams1(int)")
raise RuntimeError(("overtparams1(int)"))
if (overtparams1(100.0, 100) != 20):
raise RuntimeError, ("overtparams1(double, int)")
raise RuntimeError(("overtparams1(double, int)"))
# Combination 2
if (overtparams2(100.0, 100) != 40):
raise RuntimeError, ("overtparams2(double, int)")
raise RuntimeError(("overtparams2(double, int)"))
# Combination 3
if (overloaded() != 60):
raise RuntimeError, ("overloaded()")
raise RuntimeError(("overloaded()"))
if (overloaded(100.0, 100) != 70):
raise RuntimeError, ("overloaded(double, int)")
raise RuntimeError(("overloaded(double, int)"))
# Combination 4
if (overloadedagain("hello") != 80):
raise RuntimeError, ("overloadedagain(const char *)")
raise RuntimeError(("overloadedagain(const char *)"))
if (overloadedagain() != 90):
raise RuntimeError, ("overloadedagain(double)")
raise RuntimeError(("overloadedagain(double)"))
# specializations
if (specialization(10) != 202):
raise RuntimeError, ("specialization(int)")
raise RuntimeError(("specialization(int)"))
if (specialization(10.0) != 203):
raise RuntimeError, ("specialization(double)")
raise RuntimeError(("specialization(double)"))
if (specialization(10, 10) != 204):
raise RuntimeError, ("specialization(int, int)")
raise RuntimeError(("specialization(int, int)"))
if (specialization(10.0, 10.0) != 205):
raise RuntimeError, ("specialization(double, double)")
raise RuntimeError(("specialization(double, double)"))
if (specialization("hi", "hi") != 201):
raise RuntimeError, ("specialization(const char *, const char *)")
raise RuntimeError(("specialization(const char *, const char *)"))
# simple specialization
@ -83,61 +83,61 @@ xyz_double()
# a bit of everything
if (overload("hi") != 0):
raise RuntimeError, ("overload()")
raise RuntimeError(("overload()"))
if (overload(1) != 10):
raise RuntimeError, ("overload(int t)")
raise RuntimeError(("overload(int t)"))
if (overload(1, 1) != 20):
raise RuntimeError, ("overload(int t, const int &)")
raise RuntimeError(("overload(int t, const int &)"))
if (overload(1, "hello") != 30):
raise RuntimeError, ("overload(int t, const char *)")
raise RuntimeError(("overload(int t, const char *)"))
k = Klass()
if (overload(k) != 10):
raise RuntimeError, ("overload(Klass t)")
raise RuntimeError(("overload(Klass t)"))
if (overload(k, k) != 20):
raise RuntimeError, ("overload(Klass t, const Klass &)")
raise RuntimeError(("overload(Klass t, const Klass &)"))
if (overload(k, "hello") != 30):
raise RuntimeError, ("overload(Klass t, const char *)")
raise RuntimeError(("overload(Klass t, const char *)"))
if (overload(10.0, "hi") != 40):
raise RuntimeError, ("overload(double t, const char *)")
raise RuntimeError(("overload(double t, const char *)"))
if (overload() != 50):
raise RuntimeError, ("overload(const char *)")
raise RuntimeError(("overload(const char *)"))
# everything put in a namespace
if (nsoverload("hi") != 1000):
raise RuntimeError, ("nsoverload()")
raise RuntimeError(("nsoverload()"))
if (nsoverload(1) != 1010):
raise RuntimeError, ("nsoverload(int t)")
raise RuntimeError(("nsoverload(int t)"))
if (nsoverload(1, 1) != 1020):
raise RuntimeError, ("nsoverload(int t, const int &)")
raise RuntimeError(("nsoverload(int t, const int &)"))
if (nsoverload(1, "hello") != 1030):
raise RuntimeError, ("nsoverload(int t, const char *)")
raise RuntimeError(("nsoverload(int t, const char *)"))
if (nsoverload(k) != 1010):
raise RuntimeError, ("nsoverload(Klass t)")
raise RuntimeError(("nsoverload(Klass t)"))
if (nsoverload(k, k) != 1020):
raise RuntimeError, ("nsoverload(Klass t, const Klass &)")
raise RuntimeError(("nsoverload(Klass t, const Klass &)"))
if (nsoverload(k, "hello") != 1030):
raise RuntimeError, ("nsoverload(Klass t, const char *)")
raise RuntimeError(("nsoverload(Klass t, const char *)"))
if (nsoverload(10.0, "hi") != 1040):
raise RuntimeError, ("nsoverload(double t, const char *)")
raise RuntimeError(("nsoverload(double t, const char *)"))
if (nsoverload() != 1050):
raise RuntimeError, ("nsoverload(const char *)")
raise RuntimeError(("nsoverload(const char *)"))
A_foo(1)

8
Examples/test-suite/python/pointer_reference_runme.py
View file

@ -2,15 +2,15 @@ import pointer_reference
s = pointer_reference.get()
if s.value != 10:
raise RuntimeError, "get test failed"
raise RuntimeError("get test failed")
ss = pointer_reference.Struct(20)
pointer_reference.set(ss)
if pointer_reference.cvar.Struct_instance.value != 20:
raise RuntimeError, "set test failed"
raise RuntimeError("set test failed")
if pointer_reference.overloading(1) != 111:
raise RuntimeError, "overload test 1 failed"
raise RuntimeError("overload test 1 failed")
if pointer_reference.overloading(ss) != 222:
raise RuntimeError, "overload test 2 failed"
raise RuntimeError("overload test 2 failed")

102
Examples/test-suite/python/primitive_types_runme.py
View file

@ -31,8 +31,7 @@ v_check()
def pyerror(name, val, cte):
print "bad val/cte", name, val, cte
raise RuntimeError
raise RuntimeError("bad val/cte {} {} {}".format(name, val, cte))
pass
if cvar.var_bool != cct_bool:
@ -173,7 +172,7 @@ p = PyTest()
# internal call check
if t.c_check() != p.c_check():
raise RuntimeError, "bad director"
raise RuntimeError("bad director")
p.var_bool = p.stc_bool
p.var_schar = p.stc_schar
@ -228,63 +227,57 @@ t.v_check()
# this value contains a '0' char!
if def_namet != "hola":
print "bad namet", def_namet
raise RuntimeError
raise RuntimeError("bad namet {}".format(def_namet))
t.var_namet = def_namet
if t.var_namet != def_namet:
print "bad namet", t.var_namet, def_namet
raise RuntimeError
raise RuntimeError("bad namet {} {}".format(t.var_namet, def_namet))
t.var_namet = "hola"
if t.var_namet != "hola":
print "bad namet", t.var_namet
raise RuntimeError
raise RuntimeError("bad namet {}".format(t.var_namet))
t.var_namet = "hol"
if t.var_namet != "hol":
# if t.var_namet != "hol\0\0":
print "bad namet", t.var_namet
raise RuntimeError
raise RuntimeError("bad namet {}".format(t.var_namet))
cvar.var_char = "\0"
if cvar.var_char != "\0":
raise RuntimeError, "bad char '0' case"
raise RuntimeError("bad char '0' case")
cvar.var_char = 0
if cvar.var_char != "\0":
raise RuntimeError, "bad char '0' case"
raise RuntimeError("bad char '0' case")
cvar.var_namet = "\0"
# if cvar.var_namet != "\0\0\0\0\0":
if cvar.var_namet != "":
print "hola", "", cvar.var_namet
raise RuntimeError, "bad char '\0' case"
raise RuntimeError("bad char '\0' case hola {}".format(cvar.var_namet))
cvar.var_namet = ""
# if cvar.var_namet != "\0\0\0\0\0":
if cvar.var_namet != "":
raise RuntimeError, "bad char empty case"
raise RuntimeError("bad char empty case")
cvar.var_pchar = None
if cvar.var_pchar != None:
raise RuntimeError, "bad None case"
raise RuntimeError("bad None case")
cvar.var_pchar = ""
if cvar.var_pchar != "":
print "%c" % (cvar.var_pchar[0],)
raise RuntimeError, "bad char empty case"
raise RuntimeError("bad char empty case %c" % (cvar.var_pchar[0],))
cvar.var_pcharc = None
if cvar.var_pcharc != None:
raise RuntimeError, "bad None case"
raise RuntimeError("bad None case")
cvar.var_pcharc = ""
if cvar.var_pcharc != "":
raise RuntimeError, "bad char empty case"
raise RuntimeError("bad char empty case")
#
@ -300,13 +293,12 @@ pchar_setitem(pc, 4, 0)
cvar.var_pchar = pc
if cvar.var_pchar != "hola":
print cvar.var_pchar
raise RuntimeError, "bad pointer case"
raise RuntimeError("bad pointer case {}".format(cvar.var_pchar))
cvar.var_namet = pc
# if cvar.var_namet != "hola\0":
if cvar.var_namet != "hola":
raise RuntimeError, "bad pointer case"
raise RuntimeError("bad pointer case")
delete_pchar(pc)
@ -325,7 +317,7 @@ except OverflowError:
error = 1
pass
if error:
raise RuntimeError, "bad uchar typemap"
raise RuntimeError("bad uchar typemap")
try:
@ -338,7 +330,7 @@ except TypeError:
error = 1
pass
if error:
raise RuntimeError, "bad char typemap"
raise RuntimeError("bad char typemap")
try:
error = 0
@ -350,7 +342,7 @@ except OverflowError:
error = 1
pass
if error:
raise RuntimeError, "bad ushort typemap"
raise RuntimeError("bad ushort typemap")
try:
error = 0
@ -362,7 +354,7 @@ except OverflowError:
error = 1
pass
if error:
raise RuntimeError, "bad uint typemap"
raise RuntimeError("bad uint typemap")
try:
error = 0
@ -374,7 +366,7 @@ except OverflowError:
error = 1
pass
if error:
raise RuntimeError, "bad sizet typemap"
raise RuntimeError("bad sizet typemap")
try:
error = 0
@ -386,7 +378,7 @@ except OverflowError:
error = 1
pass
if error:
raise RuntimeError, "bad ulong typemap"
raise RuntimeError("bad ulong typemap")
#
#
@ -400,43 +392,43 @@ except TypeError:
error = 1
pass
if error:
raise RuntimeError, "bad namet typemap"
raise RuntimeError("bad namet typemap")
#
#
#
t2 = p.vtest(t)
if t.var_namet != t2.var_namet:
raise RuntimeError, "bad SWIGTYPE* typemap"
raise RuntimeError("bad SWIGTYPE* typemap")
if cvar.fixsize != "ho\0la\0\0\0":
raise RuntimeError, "bad FIXSIZE typemap"
raise RuntimeError("bad FIXSIZE typemap")
cvar.fixsize = "ho"
if cvar.fixsize != "ho\0\0\0\0\0\0":
raise RuntimeError, "bad FIXSIZE typemap"
raise RuntimeError("bad FIXSIZE typemap")
f = Foo(3)
f1 = fptr_val(f)
f2 = fptr_ref(f)
if f1._a != f2._a:
raise RuntimeError, "bad const ptr& typemap"
raise RuntimeError("bad const ptr& typemap")
v = char_foo(1, 3)
if v != 3:
raise RuntimeError, "bad int typemap"
raise RuntimeError("bad int typemap")
s = char_foo(1, "hello")
if s != "hello":
raise RuntimeError, "bad char* typemap"
raise RuntimeError("bad char* typemap")
v = SetPos(1, 3)
if v != 4:
raise RuntimeError, "bad int typemap"
raise RuntimeError("bad int typemap")
#
# Check the bounds for converting various types
@ -480,8 +472,8 @@ maxllong = overllong - 1
maxullong = 2 * maxllong + 1
# Make sure Python 2's sys.maxint is the same as the maxlong we calculated
if sys.version_info[0] <= 2 and maxlong != sys.maxint:
raise RuntimeError, "sys.maxint is not the maximum value of a signed long"
if sys.version_info[0] <= 2 and maxlong != sys.maxsize:
raise RuntimeError("sys.maxint is not the maximum value of a signed long")
def checkType(t, e, val, delta):
"""t = Test object, e = type name (e.g. ulong), val = max or min allowed value, delta = +1 for max, -1 for min"""
@ -511,7 +503,7 @@ def checkType(t, e, val, delta):
except OverflowError:
pass
if error:
raise RuntimeError, "bad " + e + " typemap"
raise RuntimeError("bad " + e + " typemap")
def checkFull(t, e, maxval, minval):
"""Check the maximum and minimum bounds for the type given by e"""
@ -543,17 +535,17 @@ def checkOverload(t, name, val, delta, prevval, limit):
if val != prevval:
# Make sure the most extreme value of this type gives the name of this type
if t.ovr_str(val) != name:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
# Make sure a more extreme value doesn't give the name of this type
try:
if t.ovr_str(val + delta) == name:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
if val == limit:
# Should raise TypeError here since this is the largest integral type
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
except TypeError:
if val != limit:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
# Check that overloading works: uchar > schar > ushort > short > uint > int > ulong > long > ullong > llong
checkOverload(t, "uchar", maxuchar, +1, 0, maxullong)
@ -568,22 +560,22 @@ checkOverload(t, "long", minlong, -1, minint, minllong)
checkOverload(t, "llong", minllong, -1, minlong, minllong)
# Make sure that large ints can be converted to doubles properly
if val_double(sys.maxint + 1) != float(sys.maxint + 1):
raise RuntimeError, "bad double typemap"
if val_double(-sys.maxint - 2) != float(-sys.maxint - 2):
raise RuntimeError, "bad double typemap"
if val_double(sys.maxsize + 1) != float(sys.maxsize + 1):
raise RuntimeError("bad double typemap")
if val_double(-sys.maxsize - 2) != float(-sys.maxsize - 2):
raise RuntimeError("bad double typemap")
# Check the minimum and maximum values that fit in ptrdiff_t and size_t
def checkType(name, maxfunc, maxval, minfunc, minval, echofunc):
if maxfunc() != maxval:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
if minfunc() != minval:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
if echofunc(maxval) != maxval:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
if echofunc(minval) != minval:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
error = 0
try:
echofunc(maxval + 1)
@ -591,14 +583,14 @@ def checkType(name, maxfunc, maxval, minfunc, minval, echofunc):
except OverflowError:
pass
if error == 1:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
try:
echofunc(minval - 1)
error = 1
except OverflowError:
pass
if error == 1:
raise RuntimeError, "bad " + name + " typemap"
raise RuntimeError("bad " + name + " typemap")
# sys.maxsize is the largest value supported by Py_ssize_t, which should be the same as ptrdiff_t
if sys.version_info[0:2] >= (2, 6):

0
Examples/test-suite/python/python_abstractbase_runme3.py → Examples/test-suite/python/python_abstractbase_runme.py
View file

2
Examples/test-suite/python/python_builtin_runme.py
View file

@ -32,7 +32,7 @@ if is_python_builtin():
passed = False
try:
h = hash(ExceptionHashFunction())
except RuntimeError, e:
except RuntimeError as e:
passed = str(e).find("oops") != -1
pass

10
Examples/test-suite/python/python_destructor_exception_runme.py
View file

@ -1,7 +1,11 @@
import python_destructor_exception
from StringIO import StringIO
import sys
if sys.version_info[0:2] < (3, 0):
import StringIO as io
else:
import io
def error_function():
python_destructor_exception.ClassWithThrowingDestructor().GetBlah()
@ -9,13 +13,13 @@ def runtest():
attributeErrorOccurred = False
try:
error_function()
except AttributeError, e:
except AttributeError:
attributeErrorOccurred = True
return attributeErrorOccurred
def test1():
stderr_saved = sys.stderr
buffer = StringIO()
buffer = io.StringIO()
attributeErrorOccurred = False
try:
# Suppress stderr while making this call to suppress the output shown by PyErr_WriteUnraisable

8
Examples/test-suite/python/python_nondynamic_runme.py
View file

@ -51,9 +51,7 @@ if python_nondynamic.retrieve_A_b(bb) != 5: raise RuntimeError("b not set correc
try:
bb.c = 3
print("bb.c = {}".format(bb.c))
print("B.c = {}".format(B.c))
raise RuntimeError("B.c class variable messes up nondynamic-ness of B")
raise RuntimeError("B.c class variable messes up nondynamic-ness of B bb.c={} B.c={}".format(bb.c, B.c))
except AttributeError as e:
debug_print(e)
pass
@ -99,9 +97,7 @@ if is_python_modern() and not python_nondynamic.is_python_builtin():
if not python_nondynamic.is_python_builtin():
try:
bb.cc = 3
print("bb.cc = {}".format(bb.cc))
print("B.cc = {}".format(B.cc))
raise RuntimeError("B.cc class variable messes up nondynamic-ness of B")
raise RuntimeError("B.cc class variable messes up nondynamic-ness of B bb.cc={} B.cc={}".format(bb.cc, B.cc))
except AttributeError as e:
debug_print(e)
pass

94
Examples/test-suite/python/python_overload_simple_cast_runme.py
View file

@ -30,136 +30,136 @@ except:
good = 1
if not good:
raise RuntimeError, "fint(int)"
raise RuntimeError("fint(int)")
if fint(ad) != "fint:int":
raise RuntimeError, "fint(int)"
raise RuntimeError("fint(int)")
if fdouble(ad) != "fdouble:double":
raise RuntimeError, "fdouble(double)"
raise RuntimeError("fdouble(double)")
if fint(ai) != "fint:int":
raise RuntimeError, "fint(int)"
raise RuntimeError("fint(int)")
if fint(5.0) != "fint:int":
raise RuntimeError, "fint(int)"
raise RuntimeError("fint(int)")
if fint(3) != "fint:int":
raise RuntimeError, "fint(int)"
raise RuntimeError("fint(int)")
if fint(3.0) != "fint:int":
raise RuntimeError, "fint(int)"
raise RuntimeError("fint(int)")
if fdouble(ad) != "fdouble:double":
raise RuntimeError, "fdouble(double)"
raise RuntimeError("fdouble(double)")
if fdouble(3) != "fdouble:double":
raise RuntimeError, "fdouble(double)"
raise RuntimeError("fdouble(double)")
if fdouble(3.0) != "fdouble:double":
raise RuntimeError, "fdouble(double)"
raise RuntimeError("fdouble(double)")
if fid(3, 3.0) != "fid:intdouble":
raise RuntimeError, "fid:intdouble"
raise RuntimeError("fid:intdouble")
if fid(3.0, 3) != "fid:doubleint":
raise RuntimeError, "fid:doubleint"
raise RuntimeError("fid:doubleint")
if fid(ad, ai) != "fid:doubleint":
raise RuntimeError, "fid:doubleint"
raise RuntimeError("fid:doubleint")
if fid(ai, ad) != "fid:intdouble":
raise RuntimeError, "fid:intdouble"
raise RuntimeError("fid:intdouble")
if foo(3) != "foo:int":
raise RuntimeError, "foo(int)"
raise RuntimeError("foo(int)")
if foo(3.0) != "foo:double":
raise RuntimeError, "foo(double)"
raise RuntimeError("foo(double)")
if foo("hello") != "foo:char *":
raise RuntimeError, "foo(char *)"
raise RuntimeError("foo(char *)")
f = Foo()
b = Bar()
if foo(f) != "foo:Foo *":
raise RuntimeError, "foo(Foo *)"
raise RuntimeError("foo(Foo *)")
if foo(b) != "foo:Bar *":
raise RuntimeError, "foo(Bar *)"
raise RuntimeError("foo(Bar *)")
v = malloc_void(32)
if foo(v) != "foo:void *":
raise RuntimeError, "foo(void *)"
raise RuntimeError("foo(void *)")
s = Spam()
if s.foo(3) != "foo:int":
raise RuntimeError, "Spam::foo(int)"
raise RuntimeError("Spam::foo(int)")
if s.foo(3.0) != "foo:double":
raise RuntimeError, "Spam::foo(double)"
raise RuntimeError("Spam::foo(double)")
if s.foo("hello") != "foo:char *":
raise RuntimeError, "Spam::foo(char *)"
raise RuntimeError("Spam::foo(char *)")
if s.foo(f) != "foo:Foo *":
raise RuntimeError, "Spam::foo(Foo *)"
raise RuntimeError("Spam::foo(Foo *)")
if s.foo(b) != "foo:Bar *":
raise RuntimeError, "Spam::foo(Bar *)"
raise RuntimeError("Spam::foo(Bar *)")
if s.foo(v) != "foo:void *":
raise RuntimeError, "Spam::foo(void *)"
raise RuntimeError("Spam::foo(void *)")
if Spam_bar(3) != "bar:int":
raise RuntimeError, "Spam::bar(int)"
raise RuntimeError("Spam::bar(int)")
if Spam_bar(3.0) != "bar:double":
raise RuntimeError, "Spam::bar(double)"
raise RuntimeError("Spam::bar(double)")
if Spam_bar("hello") != "bar:char *":
raise RuntimeError, "Spam::bar(char *)"
raise RuntimeError("Spam::bar(char *)")
if Spam_bar(f) != "bar:Foo *":
raise RuntimeError, "Spam::bar(Foo *)"
raise RuntimeError("Spam::bar(Foo *)")
if Spam_bar(b) != "bar:Bar *":
raise RuntimeError, "Spam::bar(Bar *)"
raise RuntimeError("Spam::bar(Bar *)")
if Spam_bar(v) != "bar:void *":
raise RuntimeError, "Spam::bar(void *)"
raise RuntimeError("Spam::bar(void *)")
# Test constructors
s = Spam()
if s.type != "none":
raise RuntimeError, "Spam()"
raise RuntimeError("Spam()")
s = Spam(3)
if s.type != "int":
raise RuntimeError, "Spam(int)"
raise RuntimeError("Spam(int)")
s = Spam(3.4)
if s.type != "double":
raise RuntimeError, "Spam(double)"
raise RuntimeError("Spam(double)")
s = Spam("hello")
if s.type != "char *":
raise RuntimeError, "Spam(char *)"
raise RuntimeError("Spam(char *)")
s = Spam(f)
if s.type != "Foo *":
raise RuntimeError, "Spam(Foo *)"
raise RuntimeError("Spam(Foo *)")
s = Spam(b)
if s.type != "Bar *":
raise RuntimeError, "Spam(Bar *)"
raise RuntimeError("Spam(Bar *)")
s = Spam(v)
if s.type != "void *":
raise RuntimeError, "Spam(void *)"
raise RuntimeError("Spam(void *)")
# unsigned long long
@ -168,13 +168,13 @@ ullmaxd = 9007199254740992.0
ullmin = 0
ullmind = 0.0
if ull(ullmin) != ullmin:
raise RuntimeError, "ull(ullmin)"
raise RuntimeError("ull(ullmin)")
if ull(ullmax) != ullmax:
raise RuntimeError, "ull(ullmax)"
raise RuntimeError("ull(ullmax)")
if ull(ullmind) != ullmind:
raise RuntimeError, "ull(ullmind)"
raise RuntimeError("ull(ullmind)")
if ull(ullmaxd) != ullmaxd:
raise RuntimeError, "ull(ullmaxd)"
raise RuntimeError("ull(ullmaxd)")
# long long
llmax = 9223372036854775807 # 0x7fffffffffffffff
@ -183,13 +183,13 @@ llmin = -9223372036854775808
llmaxd = 9007199254740992.0
llmind = -9007199254740992.0
if ll(llmin) != llmin:
raise RuntimeError, "ll(llmin)"
raise RuntimeError("ll(llmin)")
if ll(llmax) != llmax:
raise RuntimeError, "ll(llmax)"
raise RuntimeError("ll(llmax)")
if ll(llmind) != llmind:
raise RuntimeError, "ll(llmind)"
raise RuntimeError("ll(llmind)")
if ll(llmaxd) != llmaxd:
raise RuntimeError, "ll(llmaxd)"
raise RuntimeError("ll(llmaxd)")
free_void(v)

8
Examples/test-suite/python/python_pickle_runme.py
View file

@ -15,15 +15,15 @@ check(p)
r = p.__reduce__()
if python_pickle.cvar.debug:
print "__reduce__ returned:", r
print("__reduce__ returned: {}".format(r))
pickle_string = pickle.dumps(p)
newp = pickle.loads(pickle_string)
check(newp)
# Not yet working... some crash and others are not producing a sensible "can't be pickled" error
#nfp = python_pickle.NotForPickling("no no")
#print nfp.__reduce__()
#print("{}".format(nfp.__reduce__()))
#pickle_string = pickle.dumps(nfp)
#print pickle_string
#print("{}".format(pickle_string))
#newp = pickle.loads(pickle_string)
#print newp.msg
#print("{}".format(newp.msg))

4
Examples/test-suite/python/python_pybuffer_runme.py
View file

@ -17,13 +17,13 @@ if len(sys.argv) >= 2 and sys.argv[1] == "benchmark":
a = bytearray(b"hello world")
for i in range(k):
python_pybuffer.title1(a)
print "Time used by bytearray:", time.time() - t
print("Time used by bytearray: {}".format(time.time() - t))
t = time.time()
b = "hello world"
for i in range(k):
python_pybuffer.title2(b)
print "Time used by string:", time.time() - t
print("Time used by string: {}".format(time.time() - t))
else:
# run the test case
buf1 = bytearray(10)

8
Examples/test-suite/python/python_richcompare_runme.py
View file

@ -114,22 +114,22 @@ else:
try:
res = base1 < 42
raise RuntimeError("Failed to throw")
except TypeError,e:
except TypeError as e:
check_unorderable_types(e)
try:
res = base1 <= 42
raise RuntimeError("Failed to throw")
except TypeError,e:
except TypeError as e:
check_unorderable_types(e)
try:
res = base1 > 42
raise RuntimeError("Failed to throw")
except TypeError,e:
except TypeError as e:
check_unorderable_types(e)
try:
res = base1 >= 42
raise RuntimeError("Failed to throw")
except TypeError,e:
except TypeError as e:
check_unorderable_types(e)
# Check inequalities used for ordering

19
Examples/test-suite/python/python_strict_unicode_runme.py
View file

@ -1,8 +1,17 @@
import python_strict_unicode
import sys
test_bytes = b"hello \x01world\x99"
BYTES = b"BYTES"
test_unicode = u"h\udce9llo w\u00f6rld"
if sys.version_info[0:2] < (3, 0):
test_unicode = u"h\udce9llo w\u00f6rld"
UNICODE = u"UNICODE"
type_unicode_string = type(u"")
else:
test_unicode = "h\udce9llo w\u00f6rld"
UNICODE = "UNICODE"
type_unicode_string = type("")
# Test that byte string inputs and outputs work as expected
bdbl = python_strict_unicode.double_str(test_bytes)
@ -20,12 +29,12 @@ if type(bout) != type(BYTES):
udbl = python_strict_unicode.double_wstr(test_unicode)
if udbl != test_unicode + test_unicode:
raise RuntimeError("Failed to double wide string")
if type(udbl) != type(u""):
if type(udbl) != type_unicode_string:
raise RuntimeError("Wrong type output for wide string")
uout = python_strict_unicode.same_wstr(test_unicode)
if uout != test_unicode:
raise RuntimeError("Failed to copy wchar_t*")
if type(uout) != type(u""):
if type(uout) != type_unicode_string:
raise RuntimeError("Wrong type output for wchar_t*")
# Test that overloading is handled properly
@ -35,9 +44,9 @@ if bovr != BYTES:
if type(bovr) != type(BYTES):
raise RuntimeError("Wrong type output from overload")
uovr = python_strict_unicode.overload(test_unicode)
if uovr != u"UNICODE":
if uovr != UNICODE:
raise RuntimeError("Failed to return unicode from overload")
if type(uovr) != type(u""):
if type(uovr) != type_unicode_string:
raise RuntimeERror("Wrong type output from overload")
# Test that bytes aren't accepted as wide strings and unicode isn't accepted as narrow strings

6
Examples/test-suite/python/return_const_value_runme.py
View file

@ -3,10 +3,8 @@ import sys
p = return_const_value.Foo_ptr_getPtr()
if (p.getVal() != 17):
print "Runtime test1 failed. p.getVal()=", p.getVal()
sys.exit(1)
raise RuntimeError("Runtime test1 failed. p.getVal()={}".format(p.getVal()))
p = return_const_value.Foo_ptr_getConstPtr()
if (p.getVal() != 17):
print "Runtime test2 failed. p.getVal()=", p.getVal()
sys.exit(1)
raise RuntimeError("Runtime test2 failed. p.getVal()={}".format(p.getVal()))

4
Examples/test-suite/python/smart_pointer_member_runme.py
View file

@ -11,9 +11,7 @@ b = Bar(f)
b.y = 2
if f.y != 2:
print f.y
print b.y
raise RuntimeError
raise RuntimeError("Failed {} {}".format(f.y, b.y))
if b.x != f.x:
raise RuntimeError

24
Examples/test-suite/python/smart_pointer_not_runme.py
View file

@ -7,36 +7,36 @@ g = Grok(f)
try:
x = b.x
print "Error! b.x"
except:
raise RuntimeError("Error! b.x")
except AttributeError:
pass
try:
x = s.x
print "Error! s.x"
except:
raise RuntimeError("Error! s.x")
except AttributeError:
pass
try:
x = g.x
print "Error! g.x"
except:
raise RuntimeError("Error! g.x")
except AttributeError:
pass
try:
x = b.getx()
print "Error! b.getx()"
except:
raise RuntimeError("Error! b.getx()")
except AttributeError:
pass
try:
x = s.getx()
print "Error! s.getx()"
except:
raise RuntimeError("Error! s.getx()")
except AttributeError:
pass
try:
x = g.getx()
print "Error! g.getx()"
except:
raise RuntimeError("Error! g.getx()")
except AttributeError:
pass

21
Examples/test-suite/python/std_containers_runme.py
View file

@ -7,34 +7,33 @@ cube = (((1, 2), (3, 4)), ((5, 6), (7, 8)))
icube = std_containers.cident(cube)
for i in range(0, len(cube)):
if cube[i] != icube[i]:
raise RuntimeError, "bad cident"
raise RuntimeError("bad cident")
p = (1, 2)
if p != std_containers.pident(p):
raise RuntimeError, "bad pident"
raise RuntimeError("bad pident")
v = (1, 2, 3, 4, 5, 6)
iv = std_containers.vident(v)
for i in range(0, len(v)):
if v[i] != iv[i]:
raise RuntimeError, "bad vident"
raise RuntimeError("bad vident")
iv = std_containers.videntu(v)
for i in range(0, len(v)):
if v[i] != iv[i]:
raise RuntimeError, "bad videntu"
raise RuntimeError("bad videntu")
vu = std_containers.vector_ui(v)
if vu[2] != std_containers.videntu(vu)[2]:
raise RuntimeError, "bad videntu"
raise RuntimeError("bad videntu")
if v[0:3][1] != vu[0:3][1]:
print v[0:3][1], vu[0:3][1]
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice {} {}".format(v[0:3][1], vu[0:3][1]))
m = ((1, 2, 3), (2, 3), (3, 4))
@ -43,20 +42,20 @@ im = std_containers.midenti(m)
for i in range(0, len(m)):
for j in range(0, len(m[i])):
if m[i][j] != im[i][j]:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
m = ((True, False, True), (True, True), (True, True))
im = std_containers.midentb(m)
for i in range(0, len(m)):
for j in range(0, len(m[i])):
if m[i][j] != im[i][j]:
raise RuntimeError, "bad getslice"
raise RuntimeError("bad getslice")
mi = std_containers.imatrix(m)
mc = std_containers.cmatrix(m)
if mi[0][1] != mc[0][1]:
raise RuntimeError, "bad matrix"
raise RuntimeError("bad matrix")
map = {}
@ -67,7 +66,7 @@ map["3"] = 2
imap = std_containers.mapident(map)
for k in map:
if map[k] != imap[k]:
raise RuntimeError, "bad map"
raise RuntimeError("bad map")
# Test __contains__ (required for 'x in y' to work)
if not imap.__contains__("hello"):

4
Examples/test-suite/python/struct_value_runme.py
View file

@ -17,7 +17,7 @@ b.added = 123
if b.added != 123:
raise RuntimeError("Wrong attribute value")
if not b.__dict__.has_key("added"):
if "added" not in b.__dict__:
raise RuntimeError("Missing added attribute in __dict__")
@ -28,7 +28,7 @@ class PyBar(struct_value.Bar):
struct_value.Bar.__init__(self)
pybar = PyBar()
if not pybar.__dict__.has_key("extra"):
if "extra" not in pybar.__dict__:
raise RuntimeError("Missing extra attribute in __dict__")
if pybar.extra != "hi":
raise RuntimeError("Incorrect attribute value for extra")

20
Examples/test-suite/python/swigobject_runme.py
View file

@ -1,5 +1,5 @@
from swigobject import *
import sys
a = A()
@ -11,7 +11,11 @@ if a1.this != a2.this:
raise RuntimeError
lthis = long(a.this)
if sys.version_info[0:2] < (3, 0):
lthis = long(a.this)
else:
lthis = int(a.this)
# match pointer value, but deal with leading zeros on 8/16 bit systems and
# different C++ compilers interpretation of %p
xstr1 = "%016X" % (lthis,)
@ -23,13 +27,17 @@ xstr2 = str.lstrip(xstr2, "0")
xstr2 = str.upper(xstr2)
if xstr1 != xstr2:
print xstr1, xstr2
raise RuntimeError
raise RuntimeError("Not equal failed {} {}".format(xstr1, xstr2))
s = str(a.this)
r = repr(a.this)
v1 = v_ptr(a)
v2 = v_ptr(a)
if long(v1) != long(v2):
raise RuntimeError
if sys.version_info[0:2] < (3, 0):
if long(v1) != long(v2):
raise RuntimeError
else:
if int(v1) != int(v2):
raise RuntimeError

8
Examples/test-suite/python/template_classes_runme.py
View file

@ -13,7 +13,7 @@ RectangleInt.static_onearg(1)
fail = True
try:
rectangle.setPoint()
except TypeError, e:
except TypeError as e:
fail = False
if fail:
raise RuntimeError("argument count check failed")
@ -22,7 +22,7 @@ if fail:
fail = True
try:
rectangle.getPoint(0)
except TypeError, e:
except TypeError as e:
fail = False
if fail:
raise RuntimeError("argument count check failed")
@ -30,7 +30,7 @@ if fail:
fail = True
try:
RectangleInt.static_noargs(0)
except TypeError, e:
except TypeError as e:
fail = False
if fail:
raise RuntimeError("argument count check failed")
@ -38,7 +38,7 @@ if fail:
fail = True
try:
RectangleInt.static_onearg()
except TypeError, e:
except TypeError as e:
fail = False
if fail:
raise RuntimeError("argument count check failed")

40
Examples/test-suite/python/template_default_arg_runme.py
View file

@ -7,25 +7,25 @@ helloInt.foo(template_default_arg.Hello_int.hi)
x = template_default_arg.X_int()
if (x.meth(20.0, 200) != 200):
raise RuntimeError, ("X_int test 1 failed")
raise RuntimeError(("X_int test 1 failed"))
if (x.meth(20) != 20):
raise RuntimeError, ("X_int test 2 failed")
raise RuntimeError(("X_int test 2 failed"))
if (x.meth() != 0):
raise RuntimeError, ("X_int test 3 failed")
raise RuntimeError(("X_int test 3 failed"))
y = template_default_arg.Y_unsigned()
if (y.meth(20.0, 200) != 200):
raise RuntimeError, ("Y_unsigned test 1 failed")
raise RuntimeError(("Y_unsigned test 1 failed"))
if (y.meth(20) != 20):
raise RuntimeError, ("Y_unsigned test 2 failed")
raise RuntimeError(("Y_unsigned test 2 failed"))
if (y.meth() != 0):
raise RuntimeError, ("Y_unsigned test 3 failed")
raise RuntimeError(("Y_unsigned test 3 failed"))
x = template_default_arg.X_longlong()
x = template_default_arg.X_longlong(20.0)
x = template_default_arg.X_longlong(20.0, 200L)
x = template_default_arg.X_longlong(20.0, 200)
x = template_default_arg.X_int()
@ -54,40 +54,40 @@ fzc = x.meth(fz)
# plain function: int ott(Foo<int>)
if (template_default_arg.ott(template_default_arg.Foo_int()) != 30):
raise RuntimeError, ("ott test 1 failed")
raise RuntimeError(("ott test 1 failed"))
# %template(ott) ott<int, int>
if (template_default_arg.ott() != 10):
raise RuntimeError, ("ott test 2 failed")
raise RuntimeError(("ott test 2 failed"))
if (template_default_arg.ott(1) != 10):
raise RuntimeError, ("ott test 3 failed")
raise RuntimeError(("ott test 3 failed"))
if (template_default_arg.ott(1, 1) != 10):
raise RuntimeError, ("ott test 4 failed")
raise RuntimeError(("ott test 4 failed"))
if (template_default_arg.ott("hi") != 20):
raise RuntimeError, ("ott test 5 failed")
raise RuntimeError(("ott test 5 failed"))
if (template_default_arg.ott("hi", 1) != 20):
raise RuntimeError, ("ott test 6 failed")
raise RuntimeError(("ott test 6 failed"))
if (template_default_arg.ott("hi", 1, 1) != 20):
raise RuntimeError, ("ott test 7 failed")
raise RuntimeError(("ott test 7 failed"))
# %template(ott) ott<const char *>
if (template_default_arg.ottstring(template_default_arg.Hello_int(), "hi") != 40):
raise RuntimeError, ("ott test 8 failed")
raise RuntimeError(("ott test 8 failed"))
if (template_default_arg.ottstring(template_default_arg.Hello_int()) != 40):
raise RuntimeError, ("ott test 9 failed")
raise RuntimeError(("ott test 9 failed"))
# %template(ott) ott<int>
if (template_default_arg.ottint(template_default_arg.Hello_int(), 1) != 50):
raise RuntimeError, ("ott test 10 failed")
raise RuntimeError(("ott test 10 failed"))
if (template_default_arg.ottint(template_default_arg.Hello_int()) != 50):
raise RuntimeError, ("ott test 11 failed")
raise RuntimeError(("ott test 11 failed"))
# %template(ott) ott<double>
if (template_default_arg.ott(template_default_arg.Hello_int(), 1.0) != 60):
raise RuntimeError, ("ott test 12 failed")
raise RuntimeError(("ott test 12 failed"))
if (template_default_arg.ott(template_default_arg.Hello_int()) != 60):
raise RuntimeError, ("ott test 13 failed")
raise RuntimeError(("ott test 13 failed"))

39
Examples/test-suite/python/template_typedef_cplx2_runme.py
View file

@ -8,25 +8,21 @@ try:
d = make_Identity_double()
a = d.this
except:
print d, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(d))
s = "%s" % d
if str.find(s, "ArithUnaryFunction") == -1:
print d, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(d))
try:
e = make_Multiplies_double_double_double_double(d, d)
a = e.this
except:
print e, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(e))
s = "%s" % e
if str.find(s, "ArithUnaryFunction") == -1:
print e, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(e))
#
@ -37,25 +33,21 @@ try:
c = make_Identity_complex()
a = c.this
except:
print c, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(c))
s = "%s" % c
if str.find(s, "ArithUnaryFunction") == -1:
print c, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(c))
try:
f = make_Multiplies_complex_complex_complex_complex(c, c)
a = f.this
except:
print f, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(f))
s = "%s" % f
if str.find(s, "ArithUnaryFunction") == -1:
print f, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(f))
#
# Mix case
@ -65,29 +57,24 @@ try:
g = make_Multiplies_double_double_complex_complex(d, c)
a = g.this
except:
print g, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(g))
s = "%s" % g
if str.find(s, "ArithUnaryFunction") == -1:
print g, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(g))
try:
h = make_Multiplies_complex_complex_double_double(c, d)
a = h.this
except:
print h, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(h))
s = "%s" % h
if str.find(s, "ArithUnaryFunction") == -1:
print h, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(h))
try:
a = g.get_value()
except:
print g, "has not get_value() method"
raise RuntimeError
raise RuntimeError("{}, has not get_value() method".format(g))

36
Examples/test-suite/python/template_typedef_cplx_runme.py
View file

@ -8,25 +8,21 @@ try:
d = make_Identity_double()
a = d.this
except:
print d, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(d))
s = "%s" % d
if str.find(s, "ArithUnaryFunction") == -1:
print d, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(d))
try:
e = make_Multiplies_double_double_double_double(d, d)
a = e.this
except:
print e, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(e))
s = "%s" % e
if str.find(s, "ArithUnaryFunction") == -1:
print e, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(e))
#
@ -37,25 +33,21 @@ try:
c = make_Identity_complex()
a = c.this
except:
print c, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(c))
s = "%s" % c
if str.find(s, "ArithUnaryFunction") == -1:
print c, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(c))
try:
f = make_Multiplies_complex_complex_complex_complex(c, c)
a = f.this
except:
print f, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(f))
s = "%s" % f
if str.find(s, "ArithUnaryFunction") == -1:
print f, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(f))
#
# Mix case
@ -65,23 +57,19 @@ try:
g = make_Multiplies_double_double_complex_complex(d, c)
a = g.this
except:
print g, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(g))
s = "%s" % g
if str.find(s, "ArithUnaryFunction") == -1:
print g, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(g))
try:
h = make_Multiplies_complex_complex_double_double(c, d)
a = h.this
except:
print h, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(h))
s = "%s" % h
if str.find(s, "ArithUnaryFunction") == -1:
print h, "is not an ArithUnaryFunction"
raise RuntimeError
raise RuntimeError("{} is not an ArithUnaryFunction".format(h))

9
Examples/test-suite/python/template_typedef_runme.py
View file

@ -14,22 +14,19 @@ try:
e = make_Multiplies_float_float_float_float(d, d)
a = e.this
except:
print e, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(e))
try:
f = make_Multiplies_reald_reald_reald_reald(c, c)
a = f.this
except:
print f, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(f))
try:
g = make_Multiplies_float_float_reald_reald(d, c)
a = g.this
except:
print g, "is not an instance"
raise RuntimeError
raise RuntimeError("{} is not an instance".format(g))
# the old large format

16
Examples/test-suite/python/template_typemaps_typedef2_runme.py
View file

@ -5,7 +5,7 @@ m1 = MultimapIntA()
dummy_pair = m1.make_dummy_pair()
val = m1.typemap_test(dummy_pair).val
if val != 1234:
raise RuntimeError, "typemaps not working"
raise RuntimeError("typemaps not working")
m2 = MultimapAInt()
@ -13,24 +13,24 @@ m2 = MultimapAInt()
#dummy_pair = m2.make_dummy_pair()
#val = m2.typemap_test(dummy_pair)
# print val
# print("{}".format(val))
# if val != 4321:
# raise RuntimeError, "typemaps not working"
if typedef_test1(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test1 not working"
raise RuntimeError("typedef_test1 not working")
if typedef_test2(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test2 not working"
raise RuntimeError("typedef_test2 not working")
if typedef_test3(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test3 not working"
raise RuntimeError("typedef_test3 not working")
if typedef_test4(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test4 not working"
raise RuntimeError("typedef_test4 not working")
if typedef_test5(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test5 not working"
raise RuntimeError("typedef_test5 not working")
if typedef_test6(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test6 not working"
raise RuntimeError("typedef_test6 not working")

16
Examples/test-suite/python/template_typemaps_typedef_runme.py
View file

@ -5,7 +5,7 @@ m1 = MultimapIntA()
dummy_pair = m1.make_dummy_pair()
val = m1.typemap_test(dummy_pair).val
if val != 1234:
raise RuntimeError, "typemaps not working"
raise RuntimeError("typemaps not working")
m2 = MultimapAInt()
@ -13,24 +13,24 @@ m2 = MultimapAInt()
#dummy_pair = m2.make_dummy_pair()
#val = m2.typemap_test(dummy_pair)
# print val
# print("{}".format(val))
# if val != 4321:
# raise RuntimeError, "typemaps not working"
if typedef_test1(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test1 not working"
raise RuntimeError("typedef_test1 not working")
if typedef_test2(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test2 not working"
raise RuntimeError("typedef_test2 not working")
if typedef_test3(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test3 not working"
raise RuntimeError("typedef_test3 not working")
if typedef_test4(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test4 not working"
raise RuntimeError("typedef_test4 not working")
if typedef_test5(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test5 not working"
raise RuntimeError("typedef_test5 not working")
if typedef_test6(dummy_pair).val != 1234:
raise RuntimeError, "typedef_test6 not working"
raise RuntimeError("typedef_test6 not working")

16
Examples/test-suite/python/threads_exception_runme.py
View file

@ -3,18 +3,18 @@ import threads_exception
t = threads_exception.Test()
try:
t.unknown()
except RuntimeError, e:
except RuntimeError as e:
pass
try:
t.simple()
except RuntimeError, e:
except RuntimeError as e:
if e.args[0] != 37:
raise RuntimeError
try:
t.message()
except RuntimeError, e:
except RuntimeError as e:
if e.args[0] != "I died.":
raise RuntimeError
@ -23,18 +23,18 @@ except RuntimeError, e:
if not threads_exception.is_python_builtin():
try:
t.hosed()
except threads_exception.Exc, e:
except threads_exception.Exc as e:
code = e.code
if code != 42:
raise RuntimeError, "bad... code: %d" % code
raise RuntimeError("bad... code: %d" % code)
msg = e.msg
if msg != "Hosed":
raise RuntimeError, "bad... msg: '%s' len: %d" % (msg, len(msg))
raise RuntimeError("bad... msg: '%s' len: %d" % (msg, len(msg)))
for i in range(1, 4):
try:
t.multi(i)
except RuntimeError, e:
except RuntimeError as e:
pass
except threads_exception.Exc, e:
except threads_exception.Exc as e:
pass

8
Examples/test-suite/python/typedef_inherit_runme.py
View file

@ -5,19 +5,19 @@ b = typedef_inherit.Bar()
x = typedef_inherit.do_blah(a)
if x != "Foo::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))
x = typedef_inherit.do_blah(b)
if x != "Bar::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))
c = typedef_inherit.Spam()
d = typedef_inherit.Grok()
x = typedef_inherit.do_blah2(c)
if x != "Spam::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))
x = typedef_inherit.do_blah2(d)
if x != "Grok::blah":
print "Whoa! Bad return", x
raise RuntimeError("Whoa! Bad return {}".format(x))

4
Examples/test-suite/python/typedef_scope_runme.py
View file

@ -3,8 +3,8 @@ import typedef_scope
b = typedef_scope.Bar()
x = b.test1(42, "hello")
if x != 42:
print "Failed!!"
raise RuntimeError("Failed!!")
x = b.test2(42, "hello")
if x != "hello":
print "Failed!!"
raise RuntimeError("Failed!!")

2
Examples/test-suite/python/typemap_arrays_runme.py
View file

@ -1,4 +1,4 @@
from typemap_arrays import *
if sumA(None) != 60:
raise RuntimeError, "Sum is wrong"
raise RuntimeError("Sum is wrong")

8
Examples/test-suite/python/typename_runme.py
View file

@ -4,8 +4,8 @@ f = typename.Foo()
b = typename.Bar()
x = typename.twoFoo(f)
if not isinstance(x, types.FloatType):
raise RuntimeError, "Wrong return type (FloatType) !"
if not isinstance(x, float):
raise RuntimeError("Wrong return type (FloatType) !")
y = typename.twoBar(b)
if not isinstance(y, types.IntType):
raise RuntimeError, "Wrong return type (IntType)!"
if not isinstance(y, int):
raise RuntimeError("Wrong return type (IntType)!")

14
Examples/test-suite/python/unicode_strings_runme.py
View file

@ -2,12 +2,8 @@ import sys
import unicode_strings
# The 'u' string prefix isn't valid in Python 3.0 - 3.2 and is redundant
# in 3.3+. Since this file is run through 2to3 before testing, though,
# mark this as a unicode string in 2.x so it'll become a str in 3.x.
test_string = u"h\udce9llo w\u00f6rld"
if sys.version_info[0:2] >= (3, 1):
test_string = "h\udce9llo w\u00f6rld"
if unicode_strings.non_utf8_c_str() != test_string:
raise ValueError("Test comparison mismatch")
if unicode_strings.non_utf8_std_string() != test_string:
@ -22,15 +18,17 @@ if sys.version_info[0:2] < (3, 0):
check(unicode_strings.charstring("hello1"), "hello1")
check(unicode_strings.charstring(str(u"hello2")), "hello2")
check(unicode_strings.charstring(u"hello3"), "hello3")
check(unicode_strings.charstring(unicode("hello4")), "hello4")
check(unicode_strings.charstring(str("hello4")), "hello4")
unicode_strings.charstring(u"hell\xb05")
unicode_strings.charstring(u"hell\u00f66")
low_surrogate_string = u"\udcff"
else:
low_surrogate_string = "\udcff"
low_surrogate_string = u"\udcff"
try:
unicode_strings.instring(low_surrogate_string)
# Will succeed with Python 2
except TypeError, e:
except TypeError as e:
# Python 3 will fail the PyUnicode_AsUTF8String conversion resulting in a TypeError.
# The real error is actually:
# UnicodeEncodeError: 'utf-8' codec can't encode character '\udcff' in position 0: surrogates not allowed

16
Examples/test-suite/python/unions_runme.py
View file

@ -3,7 +3,6 @@
# union embedded within a struct can be set and read correctly.
import unions
import sys
import string
# Create new instances of SmallStruct and BigStruct for later use
@ -23,28 +22,23 @@ eut.number = 1
eut.uni.small = small
Jill1 = eut.uni.small.jill
if (Jill1 != 200):
print "Runtime test1 failed. eut.uni.small.jill=", Jill1
sys.exit(1)
raise RuntimeError("Runtime test1 failed. eut.uni.small.jill={}".format(Jill1))
Num1 = eut.number
if (Num1 != 1):
print "Runtime test2 failed. eut.number=", Num1
sys.exit(1)
raise RuntimeError("Runtime test2 failed. eut.number=".format(Num1))
# Secondly check the BigStruct in EmbeddedUnionTest
eut.number = 2
eut.uni.big = big
Jack1 = eut.uni.big.jack
if (Jack1 != 300):
print "Runtime test3 failed. eut.uni.big.jack=", Jack1
sys.exit(1)
raise RuntimeError("Runtime test3 failed. eut.uni.big.jack={}".format(Jack1))
Jill2 = eut.uni.big.smallstruct.jill
if (Jill2 != 200):
print "Runtime test4 failed. eut.uni.big.smallstruct.jill=", Jill2
sys.exit(1)
raise RuntimeError("Runtime test4 failed. eut.uni.big.smallstruct.jill={}".format(Jill2))
Num2 = eut.number
if (Num2 != 2):
print "Runtime test5 failed. eut.number=", Num2
sys.exit(1)
raise RuntimeError("Runtime test5 failed. eut.number={}".format(Num2))

18
Examples/test-suite/python/using_composition_runme.py
View file

@ -2,32 +2,32 @@ from using_composition import *
f = FooBar()
if f.blah(3) != 3:
raise RuntimeError, "FooBar::blah(int)"
raise RuntimeError("FooBar::blah(int)")
if f.blah(3.5) != 3.5:
raise RuntimeError, "FooBar::blah(double)"
raise RuntimeError("FooBar::blah(double)")
if f.blah("hello") != "hello":
raise RuntimeError, "FooBar::blah(char *)"
raise RuntimeError("FooBar::blah(char *)")
f = FooBar2()
if f.blah(3) != 3:
raise RuntimeError, "FooBar2::blah(int)"
raise RuntimeError("FooBar2::blah(int)")
if f.blah(3.5) != 3.5:
raise RuntimeError, "FooBar2::blah(double)"
raise RuntimeError("FooBar2::blah(double)")
if f.blah("hello") != "hello":
raise RuntimeError, "FooBar2::blah(char *)"
raise RuntimeError("FooBar2::blah(char *)")
f = FooBar3()
if f.blah(3) != 3:
raise RuntimeError, "FooBar3::blah(int)"
raise RuntimeError("FooBar3::blah(int)")
if f.blah(3.5) != 3.5:
raise RuntimeError, "FooBar3::blah(double)"
raise RuntimeError("FooBar3::blah(double)")
if f.blah("hello") != "hello":
raise RuntimeError, "FooBar3::blah(char *)"
raise RuntimeError("FooBar3::blah(char *)")

12
Examples/test-suite/python/using_extend_runme.py
View file

@ -2,20 +2,20 @@ from using_extend import *
f = FooBar()
if f.blah(3) != 3:
raise RuntimeError, "blah(int)"
raise RuntimeError("blah(int)")
if f.blah(3.5) != 3.5:
raise RuntimeError, "blah(double)"
raise RuntimeError("blah(double)")
if f.blah("hello") != "hello":
raise RuntimeError, "blah(char *)"
raise RuntimeError("blah(char *)")
if f.blah(3, 4) != 7:
raise RuntimeError, "blah(int,int)"
raise RuntimeError("blah(int,int)")
if f.blah(3.5, 7.5) != (3.5 + 7.5):
raise RuntimeError, "blah(double,double)"
raise RuntimeError("blah(double,double)")
if f.duh(3) != 3:
raise RuntimeError, "duh(int)"
raise RuntimeError("duh(int)")

Some files were not shown because too many files have changed in this diff Show more