Author: Wim Lavrijsen <[email protected]>
Branch: cppyy-packaging
Changeset: r92007:a0f6d0e8e563
Date: 2017-07-31 16:43 -0700
http://bitbucket.org/pypy/pypy/changeset/a0f6d0e8e563/
Log: rename destruct -> __destruct__ to not interfere with user defined
methods
diff --git a/pypy/module/_cppyy/interp_cppyy.py
b/pypy/module/_cppyy/interp_cppyy.py
--- a/pypy/module/_cppyy/interp_cppyy.py
+++ b/pypy/module/_cppyy/interp_cppyy.py
@@ -1195,7 +1195,7 @@
__len__ = interp2app(W_CPPInstance.instance__len__),
__cmp__ = interp2app(W_CPPInstance.instance__cmp__),
__repr__ = interp2app(W_CPPInstance.instance__repr__),
- destruct = interp2app(W_CPPInstance.destruct),
+ __destruct__ = interp2app(W_CPPInstance.destruct),
)
W_CPPInstance.typedef.acceptable_as_base_class = True
diff --git a/pypy/module/_cppyy/test/test_advancedcpp.py
b/pypy/module/_cppyy/test/test_advancedcpp.py
--- a/pypy/module/_cppyy/test/test_advancedcpp.py
+++ b/pypy/module/_cppyy/test/test_advancedcpp.py
@@ -32,25 +32,25 @@
assert d.m_a == t(11)
assert d.m_b == t(22)
assert d.m_c == t(33)
- d.destruct()
+ d.__destruct__()
d = defaulter(0)
assert d.m_a == t(0)
assert d.m_b == t(22)
assert d.m_c == t(33)
- d.destruct()
+ d.__destruct__()
d = defaulter(1, 2)
assert d.m_a == t(1)
assert d.m_b == t(2)
assert d.m_c == t(33)
- d.destruct()
+ d.__destruct__()
d = defaulter(3, 4, 5)
assert d.m_a == t(3)
assert d.m_b == t(4)
assert d.m_c == t(5)
- d.destruct()
+ d.__destruct__()
test_defaulter('short', int)
test_defaulter('ushort', int)
test_defaulter('int', int)
@@ -87,7 +87,7 @@
assert b.m_db == 11.11
assert b.get_base_value() == 11.11
- b.destruct()
+ b.__destruct__()
d = derived_class()
assert isinstance(d, derived_class)
@@ -114,7 +114,7 @@
assert d.m_db == 11.11
assert d.get_base_value() == 11.11
- d.destruct()
+ d.__destruct__()
def test03_namespaces(self):
"""Test access to namespaces and inner classes"""
@@ -219,7 +219,7 @@
t1 = gbl.T1(int)()
assert t1.m_t1 == 1
assert t1.get_value() == 1
- t1.destruct()
+ t1.__destruct__()
#-----
t1 = gbl.T1(int)(11)
@@ -228,14 +228,14 @@
t1.m_t1 = 111
assert t1.get_value() == 111
assert t1.m_t1 == 111
- t1.destruct()
+ t1.__destruct__()
#-----
t2 = gbl.T2(gbl.T1(int))(gbl.T1(int)(32))
t2.m_t2.m_t1 = 32
assert t2.m_t2.get_value() == 32
assert t2.m_t2.m_t1 == 32
- t2.destruct()
+ t2.__destruct__()
def test05_abstract_classes(self):
@@ -296,7 +296,7 @@
b.m_db = 22.22
assert b.m_db == 22.22
- b.destruct()
+ b.__destruct__()
#-----
c1 = c_class_1()
@@ -317,7 +317,7 @@
assert c1.m_c == 33
assert c1.get_value() == 33
- c1.destruct()
+ c1.__destruct__()
#-----
d = d_class()
@@ -345,7 +345,7 @@
assert d.m_d == 44
assert d.get_value() == 44
- d.destruct()
+ d.__destruct__()
def test07_pass_by_reference(self):
"""Test reference passing when using virtual inheritance"""
@@ -361,7 +361,7 @@
b.m_a, b.m_b = 11, 22
assert gbl.get_a(b) == 11
assert gbl.get_b(b) == 22
- b.destruct()
+ b.__destruct__()
#-----
c = c_class()
@@ -369,7 +369,7 @@
assert gbl.get_a(c) == 11
assert gbl.get_b(c) == 22
assert gbl.get_c(c) == 33
- c.destruct()
+ c.__destruct__()
#-----
d = d_class()
@@ -378,7 +378,7 @@
assert gbl.get_b(d) == 22
assert gbl.get_c(d) == 33
assert gbl.get_d(d) == 44
- d.destruct()
+ d.__destruct__()
def test08_void_pointer_passing(self):
"""Test passing of variants of void pointer arguments"""
@@ -462,8 +462,8 @@
assert not dd1a is dd2
assert not dd1b is dd2
- d2.destruct()
- d1.destruct()
+ d2.__destruct__()
+ d1.__destruct__()
def test11_multi_methods(self):
"""Test calling of methods from multiple inheritance"""
@@ -533,12 +533,12 @@
c1 = _cppyy.gbl.create_c1()
assert type(c1) == _cppyy.gbl.c_class_1
assert c1.m_c == 3
- c1.destruct()
+ c1.__destruct__()
c2 = _cppyy.gbl.create_c2()
assert type(c2) == _cppyy.gbl.c_class_2
assert c2.m_c == 3
- c2.destruct()
+ c2.__destruct__()
def test14_new_overloader(self):
"""Verify that class-level overloaded new/delete are called"""
@@ -548,7 +548,7 @@
assert _cppyy.gbl.new_overloader.s_instances == 0
nl = _cppyy.gbl.new_overloader()
assert _cppyy.gbl.new_overloader.s_instances == 1
- nl.destruct()
+ nl.__destruct__()
import gc
gc.collect()
diff --git a/pypy/module/_cppyy/test/test_cppyy.py
b/pypy/module/_cppyy/test/test_cppyy.py
--- a/pypy/module/_cppyy/test/test_cppyy.py
+++ b/pypy/module/_cppyy/test/test_cppyy.py
@@ -98,19 +98,19 @@
assert res == 11
res = t.get_overload("addDataToInt").call(e1, -4)
assert res == 3
- e1.destruct()
+ e1.__destruct__()
assert t.get_overload("getCount").call(None) == 0
raises(ReferenceError, 't.get_overload("addDataToInt").call(e1, 4)')
e1 = t.get_overload(t.type_name).call(None, 7)
e2 = t.get_overload(t.type_name).call(None, 8)
assert t.get_overload("getCount").call(None) == 2
- e1.destruct()
+ e1.__destruct__()
assert t.get_overload("getCount").call(None) == 1
- e2.destruct()
+ e2.__destruct__()
assert t.get_overload("getCount").call(None) == 0
- e2.destruct()
+ e2.__destruct__()
assert t.get_overload("getCount").call(None) == 0
raises(TypeError, t.get_overload("addDataToInt").call, 41, 4)
@@ -141,7 +141,7 @@
e1 = None
gc.collect()
assert t.get_overload("getCount").call(None) == 1
- e2.destruct()
+ e2.__destruct__()
assert t.get_overload("getCount").call(None) == 0
e2 = None
gc.collect()
@@ -178,12 +178,12 @@
e = t.get_overload(t.type_name).call(None, 13)
res = t.get_overload("addDataToDouble").call(e, 16)
assert round(res-29, 8) == 0.
- e.destruct()
+ e.__destruct__()
e = t.get_overload(t.type_name).call(None, -13)
res = t.get_overload("addDataToDouble").call(e, 16)
assert round(res-3, 8) == 0.
- e.destruct()
+ e.__destruct__()
assert t.get_overload("getCount").call(None) == 0
def test07_method_constcharp(self):
@@ -200,7 +200,7 @@
assert res == "54"
res = t.get_overload("addToStringValue").call(e, "-12") # TODO:
this leaks
assert res == "30"
- e.destruct()
+ e.__destruct__()
assert t.get_overload("getCount").call(None) == 0
def test08_pass_object_by_pointer(self):
@@ -219,8 +219,8 @@
t1.get_overload("setPayload").call(e, pl);
assert round(t2.get_overload("getData").call(pl)-50., 8) == 0
- e.destruct()
- pl.destruct()
+ e.__destruct__()
+ pl.__destruct__()
assert t1.get_overload("getCount").call(None) == 0
def test09_return_object_by_pointer(self):
@@ -239,6 +239,6 @@
pl2 = t1.get_overload("cyclePayload").call(e, pl1);
assert round(t2.get_overload("getData").call(pl2)-50., 8) == 0
- e.destruct()
- pl1.destruct()
+ e.__destruct__()
+ pl1.__destruct__()
assert t1.get_overload("getCount").call(None) == 0
diff --git a/pypy/module/_cppyy/test/test_datatypes.py
b/pypy/module/_cppyy/test/test_datatypes.py
--- a/pypy/module/_cppyy/test/test_datatypes.py
+++ b/pypy/module/_cppyy/test/test_datatypes.py
@@ -110,7 +110,7 @@
assert not hasattr(CppyyTestData, 'm_bool')
assert not hasattr(CppyyTestData, 'm_int')
- c.destruct()
+ c.__destruct__()
def test03_instance_data_write_access(self):
"""Test write access to instance public data and verify values"""
@@ -197,7 +197,7 @@
for i in range(self.N):
assert eval('c.m_%s_array2[i]' % names[j]) == b[i]
- c.destruct()
+ c.__destruct__()
def test04_array_passing(self):
"""Test passing of array arguments"""
@@ -235,7 +235,7 @@
assert not c.pass_array(_cppyy.gbl.nullptr)
raises(Exception, c.pass_array(_cppyy.gbl.nullptr).__getitem__, 0) #
id. id.
- c.destruct()
+ c.__destruct__()
def test05_class_read_access(self):
"""Test read access to class public data and verify values"""
@@ -276,7 +276,7 @@
assert round(CppyyTestData.s_double + 707., 8) == 0
assert round(c.s_double + 707., 8) == 0
- c.destruct()
+ c.__destruct__()
def test06_class_data_write_access(self):
"""Test write access to class public data and verify values"""
@@ -340,7 +340,7 @@
CppyyTestData.s_double = math.pi
assert c.s_double == math.pi
- c.destruct()
+ c.__destruct__()
def test07_range_access(self):
"""Test the ranges of integer types"""
@@ -356,7 +356,7 @@
raises(ValueError, setattr, c, 'm_uint', -1)
raises(ValueError, setattr, c, 'm_ulong', -1)
- c.destruct()
+ c.__destruct__()
def test08_type_conversions(self):
"""Test conversions between builtin types"""
@@ -374,7 +374,7 @@
raises(TypeError, c.m_int, -1.)
raises(TypeError, c.m_int, 1.)
- c.destruct()
+ c.__destruct__()
def test09_global_builtin_type(self):
"""Test access to a global builtin type"""
@@ -618,7 +618,7 @@
raises(AttributeError, getattr, c, 'm_owns_arrays')
- c.destruct()
+ c.__destruct__()
def test18_object_and_pointer_comparisons(self):
"""Verify object and pointer comparisons"""
diff --git a/pypy/module/_cppyy/test/test_pythonify.py
b/pypy/module/_cppyy/test/test_pythonify.py
--- a/pypy/module/_cppyy/test/test_pythonify.py
+++ b/pypy/module/_cppyy/test/test_pythonify.py
@@ -82,7 +82,7 @@
assert res == 11
res = instance.addDataToInt(-4)
assert res == 3
- instance.destruct()
+ instance.__destruct__()
assert example01_class.getCount() == 0
raises(ReferenceError, 'instance.addDataToInt(4)')
return
@@ -90,16 +90,16 @@
instance = example01_class(7)
instance2 = example01_class(8)
assert example01_class.getCount() == 2
- instance.destruct()
+ instance.__destruct__()
assert example01_class.getCount() == 1
- instance2.destruct()
+ instance2.__destruct__()
assert example01_class.getCount() == 0
t = self.example01
instance = example01_class(13)
res = instance.addDataToDouble(16)
assert round(res-29, 8) == 0.
- instance.destruct()
+ instance.__destruct__()
instance = example01_class(-13)
res = instance.addDataToDouble(16)
assert round(res-3, 8) == 0.
@@ -119,7 +119,7 @@
res = instance.staticAddOneToInt(1L)
assert res == 2
- instance.destruct()
+ instance.__destruct__()
assert example01_class.getCount() == 0
def test05_passing_object_by_pointer(self):
@@ -141,8 +141,8 @@
e.setPayload(pl)
assert round(pl.getData()-14., 8) == 0
- pl.destruct()
- e.destruct()
+ pl.__destruct__()
+ e.__destruct__()
assert example01_class.getCount() == 0
def test06_returning_object_by_pointer(self):
@@ -161,8 +161,8 @@
pl2 = e.cyclePayload(pl)
assert round(pl2.getData()-14., 8) == 0
- pl.destruct()
- e.destruct()
+ pl.__destruct__()
+ e.__destruct__()
assert example01_class.getCount() == 0
def test07_returning_object_by_value(self):
@@ -175,16 +175,16 @@
pl2 = example01_class.staticCopyCyclePayload(pl, 38.)
assert pl2.getData() == 38.
- pl2.destruct()
+ pl2.__destruct__()
e = example01_class(14)
pl2 = e.copyCyclePayload(pl)
assert round(pl2.getData()-14., 8) == 0
- pl2.destruct()
+ pl2.__destruct__()
- pl.destruct()
- e.destruct()
+ pl.__destruct__()
+ e.__destruct__()
assert example01_class.getCount() == 0
def test08_global_functions(self):
@@ -341,7 +341,7 @@
o = example01()
assert type(o) == example01
assert example01.getCount() == 1
- o.destruct()
+ o.__destruct__()
assert example01.getCount() == 0
class MyClass1(example01):
@@ -353,7 +353,7 @@
assert isinstance(o, example01)
assert example01.getCount() == 1
assert o.myfunc() == 1
- o.destruct()
+ o.__destruct__()
assert example01.getCount() == 0
class MyClass2(example01):
@@ -365,7 +365,7 @@
assert type(o) == MyClass2
assert example01.getCount() == 1
assert o.what == 'hi'
- o.destruct()
+ o.__destruct__()
assert example01.getCount() == 0
diff --git a/pypy/module/_cppyy/test/test_stltypes.py
b/pypy/module/_cppyy/test/test_stltypes.py
--- a/pypy/module/_cppyy/test/test_stltypes.py
+++ b/pypy/module/_cppyy/test/test_stltypes.py
@@ -102,7 +102,7 @@
assert v[i].m_i == i
assert len(v) == self.N
- v.destruct()
+ v.__destruct__()
def test03_empty_vector_type(self):
"""Test behavior of empty std::vector<int>"""
@@ -112,7 +112,7 @@
v = _cppyy.gbl.std.vector(int)()
for arg in v:
pass
- v.destruct()
+ v.__destruct__()
def test04_vector_iteration(self):
"""Test iteration over an std::vector<int>"""
@@ -137,7 +137,7 @@
assert list(v) == [i for i in range(self.N)]
- v.destruct()
+ v.__destruct__()
def test05_push_back_iterables_with_iadd(self):
"""Test usage of += of iterable on push_back-able container"""
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
