Skip to content
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

Jump to bottom

gh-128911: Add PyImport_ImportModuleAttr() function #128912

Merged
merged 11 commits into from
Jan 30, 2025
Merged

gh-128911: Add PyImport_ImportModuleAttr() function #128912

merged 11 commits into from
Jan 30, 2025

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Jan 16, 2025 •
edited by github-actions bot
Loading

Remove "pycore_import.h" includes, no longer needed.

📚 Documentation preview 📚: https://cpython-previews--128912.org.readthedocs.build/

@vstinner
pythongh-128911: Add PyImport_GetModuleAttrString() function
5f320d1 
Remove "pycore_import.h" includes, no longer needed.
@bedevere-app bedevere-app bot mentioned this pull request Jan 16, 2025
Closed
@vstinner
Copy link
Member Author

vstinner commented Jan 16, 2025 •
edited
Loading

TODO: Write tests. But PyImport C API is currently not tested, we need maybe to first write tests for existing functions?

vstinner added a commit to vstinner/cpython that referenced this pull request Jan 16, 2025
@vstinner
pythongh-128912: Add tests on the PyImport C API
3a83056 
* Add Modules/_testlimitedcapi/import.c
* Add Lib/test/test_capi/test_import.py
@vstinner
Copy link
Member Author

But PyImport C API is currently not tested, we need maybe to first write tests for existing functions?

I wrote #128915 to add these tests first.

@vstinner vstinner mentioned this pull request Jan 17, 2025
Merged
@vstinner vstinner requested a review from a team as a code owner January 17, 2025 21:17
@vstinner
Copy link
Member Author

TODO: Write tests.

Done, I added tests.

corona10
corona10 reviewed Jan 19, 2025
View reviewed changes
Python/import.c Outdated Show resolved Hide resolved
corona10
corona10 approved these changes Jan 19, 2025
View reviewed changes
Copy link
Member

@corona10 corona10 left a comment

Choose a reason for hiding this comment

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

looks good to me.

@vstinner vstinner mentioned this pull request Jan 19, 2025
Closed
6 tasks
@vstinner
Copy link
Member Author

I created a C API Working Group decision issue: capi-workgroup/decisions#53

serhiy-storchaka
serhiy-storchaka reviewed Jan 26, 2025
View reviewed changes
Lib/test/test_capi/test_import.py Outdated
@@ -317,6 +318,44 @@ def test_executecodemoduleobject(self):
# CRASHES execute_code_func(NULL, code, NULL, NULL)
# CRASHES execute_code_func(name, NULL, NULL, NULL)

def check_getmoduleattr(self, getmoduleattr):
self.assertIs(getmoduleattr('sys', 'argv'), sys.argv)
Copy link
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

Copy link
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").

Modules/_testcapi/import.c Outdated Show resolved Hide resolved
@vstinner
Copy link
Member Author

I renamed the function to PyImport_ImportModuleAttr().

@vstinner vstinner changed the title gh-128911: Add PyImport_GetModuleAttrString() function gh-128911: Add PyImport_ImportModuleAttr() function Jan 26, 2025
serhiy-storchaka
serhiy-storchaka approved these changes Jan 26, 2025
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

@vstinner
Copy link
Member Author

I created a C API Working Group decision issue: capi-workgroup/decisions#53

The C API Working Group approved the PyImport_ImportModuleAttr() API.

@vstinner vstinner enabled auto-merge (squash) January 30, 2025 11:12
@vstinner vstinner merged commit 3bebe46 into python:main Jan 30, 2025
41 checks passed
@vstinner vstinner deleted the import_getattr branch January 30, 2025 11:17
@vstinner
Copy link
Member Author

Merged, thanks for reviews!

srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Feb 7, 2025
@vstinner @srinivasreddy
pythongh-128911: Add PyImport_ImportModuleAttr() function (python#128912
2721adc 
)

Add PyImport_ImportModuleAttr() and
PyImport_ImportModuleAttrString() functions.

* Add unit tests.
* Replace _PyImport_GetModuleAttr()
  with PyImport_ImportModuleAttr().
* Replace _PyImport_GetModuleAttrString()
  with PyImport_ImportModuleAttrString().
* Remove "pycore_import.h" includes, no longer needed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@corona10 corona10 corona10 approved these changes

@erlend-aasland erlend-aasland erlend-aasland approved these changes

@berkerpeksag berkerpeksag Awaiting requested review from berkerpeksag berkerpeksag is a code owner

@pablogsal pablogsal Awaiting requested review from pablogsal pablogsal is a code owner

@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou lysnikolaou is a code owner

@pganssle pganssle Awaiting requested review from pganssle pganssle is a code owner

@abalkin abalkin Awaiting requested review from abalkin abalkin is a code owner

@kumaraditya303 kumaraditya303 Awaiting requested review from kumaraditya303 kumaraditya303 is a code owner

@brettcannon brettcannon Awaiting requested review from brettcannon brettcannon is a code owner

@ericsnowcurrently ericsnowcurrently Awaiting requested review from ericsnowcurrently ericsnowcurrently is a code owner

@ncoghlan ncoghlan Awaiting requested review from ncoghlan ncoghlan is a code owner

@warsaw warsaw Awaiting requested review from warsaw warsaw is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vstinner @serhiy-storchaka @corona10 @erlend-aasland