Commit19e99ea

committed

gh-99275: FixSystemError inctypes during__initsubclass__

1 parentc43714f commit19e99eaCopy full SHA for 19e99ea

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,15 @@ class X(Structure):`
`54`	`54`	`x.char=b'a\0b\0'`
`55`	`55`	`self.assertEqual(bytes(x),b'a\x00###')`
`56`	`56`
	`57`	`+deftest_gh99275(self):`
	`58`	`+classBrokenStructure(Structure):`
	`59`	`+def__init_subclass__(cls,**kwargs):`
	`60`	+cls._fields_= []# This line will fail, `stgdict` is not ready
	`61`	`+`
	`62`	`+withself.assertRaisesRegex(TypeError,`
	`63`	`+'ctypes state is not initialized'):`
	`64`	`+classSubclass(BrokenStructure): ...`
	`65`	`+`
`57`	`66`	`# __set__ and __get__ should raise a TypeError in case their self`
`58`	`67`	`# argument is not a ctype instance.`
`59`	`68`	`deftest___set__(self):`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix ``SystemError`` in:mod:`ctypes` when exception was not set during
	`2`	+``__initsubclass__``.

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -425,8 +425,11 @@ PyCStructUnionType_update_stgdict(PyObject type, PyObject fields, int isStruct`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`stgdict=PyType_stgdict(type);`
`428`		`-if (!stgdict)`
	`428`	`+if (!stgdict) {`
	`429`	`+PyErr_SetString(PyExc_TypeError,`
	`430`	`+"ctypes state is not initialized");`
`429`	`431`	`return-1;`
	`432`	`+ }`
`430`	`433`	`/* If this structure/union is already marked final we cannot assign`
`431`	`434`	`_fields_ anymore. */`
`432`	`435`

Comments

(0)