Skip to content

gh-128911: Add PyImport_ImportModuleAttr() function #128912

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

Merged
vstinner merged 11 commits into from
Jan 30, 2025
Merged

gh-128911: Add PyImport_ImportModuleAttr() function #128912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f320d1
gh-128911: Add PyImport_GetModuleAttrString() function
vstinner Jan 16, 2025
f76b1cd
Add also PyImport_GetModuleAttr()
vstinner Jan 16, 2025
aa3e0a3
Merge branch 'main' into import_getattr
vstinner Jan 17, 2025
d2d9246
Add tests
vstinner Jan 17, 2025
94ff629
Add tests on invalid module/attribute name types
vstinner Jan 19, 2025
7addf5a
PyImport_GetModuleAttr() to refcounts.dat
vstinner Jan 19, 2025
075a205
Replace non-breaking space with space in comment
vstinner Jan 26, 2025
4fc2e10
Address Serhiy's review
vstinner Jan 26, 2025
22d4856
Rename to PyImport_ImportModuleAttr()
vstinner Jan 26, 2025
95c739f
Rename also _testcapi functions
vstinner Jan 26, 2025
073214c
Merge branch 'main' into import_getattr
vstinner Jan 29, 2025
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
Address Serhiy's review 
* Add more tests
* Add 'const'
  • Loading branch information
@vstinner
vstinner committed Jan 26, 2025
commit 4fc2e10ee4855abe7121140fd3d32d1bdea7af4b
15 changes: 15 additions & 0 deletions Lib/test/test_capi/test_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,21 @@ def check_getmoduleattr(self, getmoduleattr):
self.assertIs(getmoduleattr('sys', 'argv'), sys.argv)

@serhiy-storchaka serhiy-storchaka Jan 26, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check also a module name containing dots.

Check errors:

  • non-existent module
  • relative module name
  • non-existent attribute
  • attribute name containing dots

@vstinner vstinner Jan 26, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added requested tests.

attribute name containing dots

getmoduleattr('sys', 'implementation.name') raises an AttributeError. I prefer to not implement "nested" getattr(). One should write getmoduleattr('sys', 'implementation') + PyObject_GetAttrString(attr, "name").

self.assertIs(getmoduleattr('types', 'ModuleType'), types.ModuleType)

# module name containing a dot
attr = getmoduleattr('email.message', 'Message')
from email.message import Message
self.assertIs(attr, Message)

with self.assertRaises(ImportError):
# nonexistent module
getmoduleattr('nonexistentmodule', 'attr')
with self.assertRaises(AttributeError):
# nonexistent attribute
getmoduleattr('sys', 'nonexistentattr')
with self.assertRaises(AttributeError):
# attribute name containing a dot
getmoduleattr('sys', 'implementation.name')

def test_getmoduleattr(self):
# Test PyImport_GetModuleAttr()
getmoduleattr = _testcapi.PyImport_GetModuleAttr
Expand Down
2 changes: 1 addition & 1 deletion Modules/_testcapi/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pyimport_getmoduleattr(PyObject *self, PyObject *args)
static PyObject *
pyimport_getmoduleattrstring(PyObject *self, PyObject *args)
{
char *mod_name, *attr_name;
const char *mod_name, *attr_name;
Py_ssize_t len;
if (!PyArg_ParseTuple(args, "z#z#", &mod_name, &len, &attr_name, &len)) {
return NULL;
Expand Down