Skip to content

[PEP 573] bpo-38787: Module State Access from C Extension Methods #17145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 22 commits into from
Closed

[PEP 573] bpo-38787: Module State Access from C Extension Methods #17145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6026bc1
add ht_module to heap types
Dec 8, 2017
f2d45a4
Implement PyCMethod
Dec 15, 2017
e85b726
static exception prototype
Jan 3, 2018
e593a86
METH_METHOD clinic support
Jan 19, 2018
9f9f81f
slot method per-module state access
Jan 30, 2018
625a961
port io module
Feb 13, 2018
6ad36fb
port _csv module
Feb 20, 2018
a526fc5
clinic support for METH_METHOD and heaptype state access
Mar 5, 2018
085cab7
port _elementtree
Feb 25, 2018
b95d6a4
consoleio
Mar 6, 2018
1f6c04d
Helper for getting per-module state from type
Apr 5, 2018
41fe314
Correct MRO walking algorithm
Apr 16, 2018
40275e2
Limited APIs - rewrite from 3.7 to 3.8
Apr 17, 2018
a84e9a2
EuroPython Sprint Changes
Jun 28, 2019
7f78843
recover clinic after rebase
Jul 15, 2019
387267a
Sanitize the implementation
Oct 16, 2019
f284861
Update method_enter_call() call
Nov 13, 2019
4422099
Revert Objects/typeslots.py changes.
Nov 13, 2019
06c13dd
Remove MRO walker.
Jan 21, 2020
a54f720
Reflect PR comments
Jan 22, 2020
a6cd004
Add news entry
Jan 22, 2020
f77edf4
Reflect also hidden comments
Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
slot method per-module state access
  • Loading branch information
Marcel Plch Marcel Plch
Marcel Plch authored and Marcel Plch committed Jan 21, 2020
commit 9f9f81f550d776df05ca3615e3bf3ee0854f110b
2 changes: 2 additions & 0 deletions Include/cpython/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,8 @@ PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *
PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
PyAPI_FUNC(PyObject *) PyType_GetModule(PyTypeObject *);
PyAPI_FUNC(PyObject *) PyType_GetModule(PyTypeObject *);
PyAPI_FUNC(PyTypeObject *) PyType_DefiningTypeFromSlotFunc(PyTypeObject *, int, void *);

struct _Py_Identifier;
PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
Expand Down
43 changes: 24 additions & 19 deletions Lib/test/test_importlib/extension/test_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ def test_bad_traverse(self):
pass"""
assert_python_failure("-c", script)

def test_pseudostatic_exception(self):
mod_name = "_testmultiphase"
def test_immutable_exception(self):
mod_name = "_testmultiphase_meth_state_access"

a = self.load_module_by_name(mod_name)
b = self.load_module_by_name(mod_name)
Expand All @@ -304,41 +304,46 @@ def test_pseudostatic_exception(self):


# test the opposite instances' exceptions catching
expected_catch = 2
catch = 0
expected_catchcount = 2
catchcount = 0
try:
raise(a.StaticError)
except b.StaticError:
catch += 1
catchcount += 1

try:
raise(b.StaticError)
except a.StaticError:
catch += 1
catchcount += 1

self.assertEqual(catch, expected_catch)
self.assertEqual(catchcount, expected_catchcount)

# make sure the exception exists as long as there are
# any (even not from module) references to it
a_Example = a.Example
b_Example = b.Example
# make sure the exception gets deallocated
del a
del b
gc.collect()
a_ex = a_Example()
b_ex = b_Example()
a_module = a_ex.get_defining_module()
b_module = a_ex.get_defining_module()
a = self.load_module_by_name("_testmultiphase_check_staterr")

self.assertIs(a_module, b_module)
self.assertTrue(a.check_staterr_null())

def test_immutable_exception_multiple_inheritance(self):
mod_name = "_testmultiphase_immutable_exc_multip_inheritance"

m = self.load_module_by_name(mod_name)

def raise_exc():
raise m.Staterr

self.assertRaises(TypeError, raise_exc)
self.assertRaises(BufferError, raise_exc)

def test_subclass_get_module(self):
testmultiphase = self.load_module_by_name("_testmultiphase")
testmultiphase = self.load_module_by_name("_testmultiphase_meth_state_access")

class Example_Subclass(testmultiphase.Example):
class StateAccessType_Subclass(testmultiphase.StateAccessType):
pass

ex = Example_Subclass()
ex = StateAccessType_Subclass()

self.assertIs(ex.get_defining_module(), testmultiphase)

Expand Down
Loading