From b4189be2b2d3c350fdf33e27309bee5a72e4f72a Mon Sep 17 00:00:00 2001 From: Simon van der Linden Date: Fri, 8 Jan 2010 20:33:44 +0100 Subject: Don't set a default constructor for structures. Update tests accordingly. The reason for this change is that setting __new__ in the metaclass doesn't let one overrides it afterwards, in a subclass (in my experience, at least, even though it seems weird). https://bugzilla.gnome.org/show_bug.cgi?id=603536 --- tests/test_gi.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'tests/test_gi.py') diff --git a/tests/test_gi.py b/tests/test_gi.py index 9344edd..8de9114 100644 --- a/tests/test_gi.py +++ b/tests/test_gi.py @@ -1246,29 +1246,28 @@ class TestStructure(unittest.TestCase): del in_struct del out_struct - def test_boxed_without_constructor_struct(self): - self.assertTrue(issubclass(TestGI.BoxedWithoutConstructorStruct, gobject.GBoxed)) + def test_boxed_struct(self): + self.assertTrue(issubclass(TestGI.BoxedStruct, gobject.GBoxed)) - struct = TestGI.BoxedWithoutConstructorStruct() + struct = TestGI.BoxedStruct() + self.assertTrue(isinstance(struct, TestGI.BoxedStruct)) - self.assertTrue(isinstance(struct, TestGI.BoxedWithoutConstructorStruct)) + del struct - new_struct = struct.copy() - self.assertTrue(isinstance(new_struct, TestGI.BoxedWithoutConstructorStruct)) + def test_boxed_struct_new(self): + struct = TestGI.BoxedStruct.new() + self.assertTrue(isinstance(struct, TestGI.BoxedStruct)) del struct - del new_struct - def test_boxed_struct(self): + def test_boxed_struct_copy(self): struct = TestGI.BoxedStruct() - self.assertTrue(isinstance(struct, TestGI.BoxedStruct)) - new_struct = struct.copy() self.assertTrue(isinstance(new_struct, TestGI.BoxedStruct)) - del struct del new_struct + del struct def test_boxed_struct_return(self): struct = TestGI.boxed_struct_return() -- cgit