Skip to content

gh-78997: AttributeError if loading fails in LibraryLoader.__getattr__#25177

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
Merged
FFY00 merged 7 commits into from
Dec 15, 2022
Merged

gh-78997: AttributeError if loading fails in LibraryLoader.__getattr__ #25177

FFY00 merged 7 commits into from
Dec 15, 2022

Conversation

@farfella
Copy link
Contributor

@farfellafarfella commented Apr 4, 2021•
edited by terryjreedy
Loading

@the-knights-who-say-ni
Copy link

the-knights-who-say-ni commented Apr 4, 2021

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@farfella

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@github-actions
Copy link

github-actionsbot commented Jun 13, 2021

This PR is stale because it has been open for 30 days with no activity.

@github-actionsgithub-actionsbot added the stale Stale PR or inactive for long period of time. label Jun 13, 2021
@jacobtylerwalls
Copy link
Contributor

jacobtylerwalls commented Jun 14, 2021•
edited
Loading

Hi @farfella, thanks for this, do you think you could add a brief test to verify the original use case? I'm not an expert, but I would assume Lib/ctypes/test/test_loader.py would be a reasonable place to start.

@jacobtylerwalls
Copy link
Contributor

jacobtylerwalls commented Jun 14, 2021

Ah, sorry I was referring to an existing file and meant "test_loading.py", not "test_loader.py", my mistake:

cpython/Lib/ctypes/test/test_loading.py

Line 26 in 507ed6f

classLoaderTest(unittest.TestCase):

@farfella
Copy link
ContributorAuthor

farfella commented Jun 14, 2021

Thanks for your all your help and feedback, @jacobtylerwalls! :) Hoping style-checks passes this time.

jacobtylerwalls
jacobtylerwalls reviewed Jun 14, 2021
View reviewed changes
@github-actionsgithub-actionsbot removed the stale Stale PR or inactive for long period of time. label Jun 15, 2021
@farfella
Copy link
ContributorAuthor

farfella commented Jun 15, 2021

Thanks! Fewer lines of code. :)

eric-wieser
eric-wieser reviewed Dec 15, 2022
View reviewed changes
Misc/NEWS.d/next/Windows/2021-04-08-00-36-37.bpo-34816.4Xe0id.rst Outdated
@@ -0,0 +1 @@
Fix issue where hasattr(ctypes.windll, 'somefunction') raises OSError instead of the expected behavior: returning False No newline at end of file
Copy link
Contributor

@eric-wiesereric-wieserDec 15, 2022

Choose a reason for hiding this comment

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

Suggested change
Fix issue where hasattr(ctypes.windll, 'somefunction') raises OSError instead of the expected behavior: returning False
`hasattr(ctypes.windll, 'nonexistant')` now returns `False` instead of raising `OSError`.

eric-wieser
eric-wieser reviewed Dec 15, 2022
View reviewed changes
Lib/ctypes/test/test_loading.py Outdated
Comment on lines 122 to 124
# This test case verifies that
# ctypes.LoadLibrary.__getattr__ raises AttributeError
# when name cannot be resolved
Copy link
Contributor

@eric-wiesereric-wieserDec 15, 2022

Choose a reason for hiding this comment

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

Suggested change
# This test case verifies that
# ctypes.LoadLibrary.__getattr__ raises AttributeError
# when name cannot be resolved
# bpo-34816: shouldn't raise OSError

eric-wieser
eric-wieser approved these changes Dec 15, 2022
View reviewed changes
Copy link
Contributor

@eric-wiesereric-wieser left a comment

Choose a reason for hiding this comment

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

LGTM!

@netlify
Copy link

netlifybot commented Dec 15, 2022•
edited
Loading

✅ Deploy Preview for python-cpython-preview canceled.

NameLink
🔨 Latest commitf151341
🔍 Latest deploy loghttps://app.netlify.com/sites/python-cpython-preview/deploys/639b9b8d57bbf700082c03c5

@FFY00
Copy link
Member

FFY00 commented Dec 15, 2022

@farfella I am now in a position where I can merge this, could you update the PR to resolve the conflicts?

@bedevere-bot
Copy link

bedevere-bot commented Dec 15, 2022

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

@ghost
Copy link

ghost commented Dec 15, 2022•
edited by ghost
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@eric-wieser
Copy link
Contributor

eric-wieser commented Dec 15, 2022

@farfella, it looks like you just discarded all your changes...

@farfella
Copy link
ContributorAuthor

farfella commented Dec 15, 2022

Yeah.... I saw this "Sync fork" button (that is new to me) for my branch on GitHub web UI and clicked it. This is the consequence.... My local copy still has everything. I'll push that up.

@farfella
Copy link
ContributorAuthor

farfella commented Dec 15, 2022

Updated PR to resolve conflicts

@farfellafarfella reopened this Dec 15, 2022
@cjw296cjw296 removed their request for review December 15, 2022 20:13
@terryjreedy
Copy link
Member

terryjreedy commented Dec 15, 2022

force-pushing may be the reason for the review-request spamming. Please use simple update merges. git merge upstream/main last I knew.

@terryjreedyterryjreedy changed the title bpo-34816: Raise AttributeError if loading fails in ctypes.LibraryLoader.__get_attr__gh-78997: Raise AttributeError if loading fails in ctypes.LibraryLoader.__get_attr__Dec 15, 2022
@FFY00
Copy link
Member

FFY00 commented Dec 15, 2022

Alright, thank you @farfella for getting this back into shape! Can you just apply the feedback from code-review from @eric-wieser? After that, we can go ahead and merge this 👍

FFY00
FFY00 reviewed Dec 15, 2022
View reviewed changes
FFY00
FFY00 reviewed Dec 15, 2022
View reviewed changes
zware
zware reviewed Dec 15, 2022
View reviewed changes
@FFY00@zware
Update Misc/NEWS.d/next/Windows/2021-04-08-00-36-37.bpo-34816.4Xe0id.rst
f151341
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
@AlexWaygoodAlexWaygood changed the title gh-78997: Raise AttributeError if loading fails in ctypes.LibraryLoader.__get_attr__gh-78997: Raise AttributeError if loading fails in ctypes.LibraryLoader.__getattr__Dec 15, 2022
@FFY00FFY00 changed the title gh-78997: Raise AttributeError if loading fails in ctypes.LibraryLoader.__getattr__gh-78997: AttributeError if loading fails in LibraryLoader.__getattr__Dec 15, 2022
@FFY00FFY00 merged commit 101cfe6 into python:mainDec 15, 2022
@FFY00
Copy link
Member

FFY00 commented Dec 15, 2022

Thanks @farfella for the fix, and @eric-wieser for the review!

eli-schwartz added a commit to eli-schwartz/cpython that referenced this pull request Dec 22, 2022
@eli-schwartz
pythongh-25177: fix bad rebase of moved test file
1ff6ee3
During the process of merging in a year and a half of changes, the modified test file `test_loading.py` accidentally got converted to a newly added file in an old location, rather than an existing test file with an updated test. Merge the changes in this file into the new canonical location since pythongh-93839, and delete the old file.
@eli-schwartz
Copy link
Contributor

eli-schwartz commented Dec 22, 2022

Minor rebase issue in the test file. :)

@lfriedrilfriedrimannequin mentioned this pull request Apr 10, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zwarezwarezware left review comments

@FFY00FFY00FFY00 approved these changes

@jaracojaracoAwaiting requested review from jaraco

@brettcannonbrettcannonAwaiting requested review from brettcannon

@encukouencukouAwaiting requested review from encukou

@ethanfurmanethanfurmanAwaiting requested review from ethanfurman

@gvanrossumgvanrossumAwaiting requested review from gvanrossum

@Fidget-SpinnerFidget-SpinnerAwaiting requested review from Fidget-Spinner

@JelleZijlstraJelleZijlstraAwaiting requested review from JelleZijlstra

@terryjreedyterryjreedyAwaiting requested review from terryjreedy

@ericvsmithericvsmithAwaiting requested review from ericvsmith

@rhettingerrhettingerAwaiting requested review from rhettinger

@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag

@gpsheadgpsheadAwaiting requested review from gpshead

@erlend-aaslanderlend-aaslandAwaiting requested review from erlend-aasland

@isidenticalisidenticalAwaiting requested review from isidentical

+2 more reviewers

@jacobtylerwallsjacobtylerwallsjacobtylerwalls left review comments

@eric-wiesereric-wiesereric-wieser approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@farfella@the-knights-who-say-ni@jacobtylerwalls@FFY00@bedevere-bot@eric-wieser@terryjreedy@eli-schwartz@zware@ezio-melotti