Skip to content

gh-120170: Exclude __mp_main__ in C version of whichmodule()#120171

Merged
hugovk merged 2 commits into
python:mainfrom
li-dan:fix_120170
May 23, 2025
Merged

gh-120170: Exclude __mp_main__ in C version of whichmodule()#120171
hugovk merged 2 commits into
python:mainfrom
li-dan:fix_120170

Conversation

@li-dan

@li-dan li-dan commented Jun 6, 2024

Copy link
Copy Markdown
Contributor

Importing multiprocessing adds an alias to __main__ named __mp_main__. In #23403, the Python version of whichmodule() was fixed to exclude __mp_main__. Apply the same fix to the C version of the function.

@ghost

ghost commented Jun 6, 2024

Copy link
Copy Markdown

The following commit authors need to sign the Contributor License Agreement:

Click the button to sign:
CLA not signed

@bedevere-app

bedevere-app Bot commented Jun 6, 2024

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@li-dan

li-dan commented Jun 6, 2024

Copy link
Copy Markdown
Contributor Author

With respect to the CLA, I am making this contribution on behalf of my organization, D. E. Shaw & Co., L.P. In 2018 we signed a CLA associated with the bugs.python.org username katz.

@lysnikolaou lysnikolaou left a comment

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.

Thanks for the PR @li-dan! I'm going to approve this, since it seems straightforward enough. However, it'd be best if someone else was to give it a quick look.

Also, should @li-dan re-sign the CLA? What's the process here? cc @ambv

Comment thread Misc/NEWS.d/next/Library/2024-06-06-17-49-07.gh-issue-120170.DUxhmT.rst Outdated
Importing multiprocessing adds an alias to __main__ named __mp_main__.
In python#23403, the Python version of whichmodule() was fixed to exclude
__mp_main__. Apply the same fix to the C version of the function.
@lysnikolaou

Copy link
Copy Markdown
Member

@li-dan You'll need to sign the CLA individually as well.

@li-dan

li-dan commented Mar 19, 2025

Copy link
Copy Markdown
Contributor Author

Thanks for taking a look at this, @lysnikolaou.

Is there any documentation on the CLA policy? My organization is making this contribution and holds rights to the contribution, so it doesn't seem correct that I should be involved in the licensing process as an individual.

@lysnikolaou

Copy link
Copy Markdown
Member

I'm not sure what the correct thing to do here is. @ambv You probably know best. Could you please address @li-dan's concerns?

@python-cla-bot

python-cla-bot Bot commented Apr 6, 2025

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.

CLA signed

@hugovk

hugovk commented Apr 8, 2025

Copy link
Copy Markdown
Member

@li-dan With the current CLA setup you'll also need to sign an individual CLA. Please could you do that?

See also https://www.python.org/psf/contrib/ which says "The PSF is now asking all past and future contributors to sign a Contributor Agreement."

Thank you.

@li-dan

li-dan commented Apr 8, 2025

Copy link
Copy Markdown
Contributor Author

I'm happy to sign the CLA in my personal capacity, but it would not be able to apply to this PR. My organization is licensing this contribution, and as an individual, I do not have rights to grant a license to the contribution. Is that okay?

@python python deleted a comment Apr 8, 2025
@ambv

ambv commented Apr 8, 2025

Copy link
Copy Markdown
Contributor

@li-dan

Yes, this is okay.

We are not aware of the geographical jurisdiction of each particular company and employee. We are also not privy to their particular contract and details about the form of their collaboration. Laws differ between all those cases. Therefore, we always require individual CLAs.

In the case where a blanket organizational CLA already covers a company, and the copyright of a PR is already legally assigned to the company, this is a no-op legally. Such a contributor isn't granting any additional licenses that weren't already granted. But even in this case, it allows Python to track which employees are contributors. It also covers the case where a contributor deliberately or otherwise uses a private email address when authoring their commits.

@li-dan

li-dan commented Apr 14, 2025

Copy link
Copy Markdown
Contributor Author

Thanks for the background, @ambv. I am consulting with my employer on how we want to proceed.

@li-dan

li-dan commented May 23, 2025

Copy link
Copy Markdown
Contributor Author

I have signed the individual CLA.

@hugovk hugovk merged commit 05a19b5 into python:main May 23, 2025
1 check passed
@hugovk

hugovk commented May 23, 2025

Copy link
Copy Markdown
Member

Thank you!

@lysnikolaou Does this need backporting?

@lysnikolaou

Copy link
Copy Markdown
Member

I think this qualifies as a bug, so probably should be backported, but I'm not sure.

Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
…ython#120171)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
…ython#120171)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
gostak-dd pushed a commit to gostak-dd/cpython that referenced this pull request Jun 2, 2026
…ython#120171)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants