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.

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

Fix typos in the Modules directory #28761

Merged
merged 2 commits into from Oct 7, 2021
Merged

Fix typos in the Modules directory #28761

merged 2 commits into from Oct 7, 2021

Conversation

cclauss
Copy link
Contributor

@cclauss cclauss commented Oct 6, 2021 •
edited

Like #28744 but for the Modules directory.

[skip issue] Opening a related issue is pending python/psf-infra-meta#130

For clarity, there were eight pull requests to main in this effort to use codespell to find typos.

  1. Fix typos in the Doc directory #28744
  2. Fix typos in the Include directory #28745
  3. Fix typos in the Mac and Misc directories #28756
  4. Fix typos in the Modules directory #28761
  5. Fix typos in the Objects directory #28766
  6. Fix typos in the Python directory #28767
  7. Fix typos in the Tools directory #28769
  8. Fix typos in the Lib directory #28775

There also need to be backports for each to 3.9 and 3.10:

  1. [3.9] Fix typos in the Doc directory #28744 #28759 and [3.10] Fix typos in the Doc directory #28744 #28758
  2. [3.9] Fix typos in the Include directory (GH-28745) #28788 and [3.10] Fix typos in the Include directory (GH-28745) #28789
  3. [3.9] [Misc] [Mac] Fix typos found using codespell (GH-28756) #28793 and [3.10] [Misc] [Mac] Fix typos found using codespell (GH-28756) #28794
  4. [3.9] Fix typos in the Modules directory (GH-28761). #28791 and [3.10] Fix typos in the Modules directory (GH-28761) #28781
  5. [3.9] Fix typos in the Objects directory (GH-28766) #28795 and [3.10] Fix typos in the Objects directory (GH-28766) #28797
  6. [3.9] Fix typos in the Python directory (GH-28767) #28798 and [3.10] Fix typos in the Python directory (GH-28767) #28799
  7. [3.9] Fix typos in the Tools directory (GH-28769) #28800 and [3.10] Fix typos in the Tools directory (GH-28769) #28801
  8. [3.9] Fix typos in the Lib directory (GH-28775) #28803 and [3.10] Fix typos in the Lib directory (GH-28775) #28804

@cclauss cclauss requested a review from tiran as a code owner Oct 6, 2021
@gpshead gpshead self-assigned this Oct 6, 2021
@gpshead
Copy link
Member

gpshead commented Oct 6, 2021

There are ~5 of these PRs, see #28745 (comment) for details on how we're handling them. TL;DR - I'm taking the reviews. Backports to 3.9 and 3.10 are being done (manually) to reduce potential for merge conflicts of other bugfix backports.

gpshead
gpshead requested changes Oct 6, 2021
View changes
Modules/_ctypes/libffi_osx/include/ffi.h Outdated Show resolved Hide resolved
@bedevere-bot
Copy link

bedevere-bot commented Oct 6, 2021

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@terryjreedy
Copy link
Member

terryjreedy commented Oct 6, 2021 •
edited

LGTM, with Gregory's comment

@cclauss cclauss requested a review from gpshead Oct 7, 2021
gpshead
gpshead approved these changes Oct 7, 2021
View changes
@gpshead gpshead merged commit dd02a69 into python:main Oct 7, 2021
11 checks passed
@miss-islington
Copy link
Contributor

miss-islington commented Oct 7, 2021

Thanks @cclauss for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Oct 7, 2021

Sorry, @cclauss and @gpshead, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker dd02a696e55b450413e765e698e653d781ca4205 3.9

@bedevere-bot
Copy link

bedevere-bot commented Oct 7, 2021

GH-28781 is a backport of this pull request to the 3.10 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 7, 2021
@cclauss @miss-islington
Fix typos in the Modules directory (pythonGH-28761)
8f3edb0 
(cherry picked from commit dd02a69)

Co-authored-by: Christian Clauss <cclauss@me.com>
miss-islington added a commit that referenced this pull request Oct 7, 2021
@miss-islington
[3.10] Fix typos in the Modules directory (GH-28761) (GH-28781)
5afc5bb 
(cherry picked from commit dd02a69)


Co-authored-by: Christian Clauss <cclauss@me.com>

Automerge-Triggered-By: GH:gpshead
@bedevere-bot
Copy link

bedevere-bot commented Oct 7, 2021

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot x86-64 macOS 3.10 has failed when building commit 5afc5bb.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/681/builds/441) and take a look at the build logs.
  4. Check if the failure is related to this commit (5afc5bb) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/681/builds/441

Failed tests:

  • test_importlib

Failed subtests:

  • test_multiprocessing_pool_circular_import - test.test_importlib.test_threaded_import.ThreadedImportTests

Summary of the results of the build (if available):

==

Click to see traceback logs 
Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/test/test_importlib/partial/pool_in_threads.py", line 9, in t
    with multiprocessing.Pool(1):
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/context.py", line 119, in Pool
    return Pool(processes, initializer, initargs, maxtasksperchild,
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/pool.py", line 196, in __init__
    self._change_notifier = self._ctx.SimpleQueue()
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/context.py", line 113, in SimpleQueue
    return SimpleQueue(ctx=self.get_context())
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/queues.py", line 341, in __init__
    self._reader, self._writer = connection.Pipe(duplex=False)
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/connection.py", line 532, in Pipe
    fd1, fd2 = os.pipe()
OSError: [Errno 24] Too many open files
/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py:224: UserWarning: resource_tracker: There appear to be 118 leaked semaphore objects to clean up at shutdown
  warnings.warn('resource_tracker: There appear to be %d '
/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py:237: UserWarning: resource_tracker: '/mp-p2yzysbk': [Errno 2] No such file or directory
  warnings.warn('resource_tracker: %r: %s' % (name, e))
/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py:237: UserWarning: resource_tracker: '/mp-__5l0m52': [Errno 2] No such file or directory
  warnings.warn('resource_tracker: %r: %s' % (name, e))
/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py:237: UserWarning: resource_tracker: '/mp-ypf05fdv': [Errno 2] No such file or directory
  warnings.warn('resource_tracker: %r: %s' % (name, e))
/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py:237: UserWarning: resource_tracker: '/mp-qrs6dt1l': [Errno 2] No such file or directory
  warnings.warn('resource_tracker: %r: %s' % (name, e))
/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py:237: UserWarning: resource_tracker: '/mp-xujj3ky7': [Errno 2] No such file or directory
  warnings.warn('resource_tracker: %r: %s' % (name, e))
---


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
    cache[rtype].remove(name)
KeyError: '/psm_dd55664c'


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
    cache[rtype].remove(name)
KeyError: '/psm_c1c7fe37'


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/test/test_importlib/test_threaded_import.py", line 258, in test_multiprocessing_pool_circular_import
    script_helper.assert_python_ok(fn)
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/test/support/script_helper.py", line 160, in assert_python_ok
    return _assert_python(True, *args, **env_vars)
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/test/support/script_helper.py", line 145, in _assert_python
    res.fail(cmd_line)
  File "/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/test/support/script_helper.py", line 72, in fail
    raise AssertionError("Process return code is %d\n"
AssertionError: Process return code is 1
command line: ['/Users/buildbot/buildarea/3.10.billenstein-macos/build/python.exe', '-X', 'faulthandler', '-I', '/Users/buildbot/buildarea/3.10.billenstein-macos/build/Lib/test/test_importlib/partial/pool_in_threads.py']

cclauss added a commit to cclauss/cpython that referenced this pull request Oct 7, 2021
@cclauss
[3.9] Fix typos in the Modules directory (pythonGH-28761).
412274d 
(cherry picked from commit dd02a69)

Co-authored-by: Christian Clauss <cclauss@me.com>
@bedevere-bot
Copy link

bedevere-bot commented Oct 7, 2021

GH-28791 is a backport of this pull request to the 3.9 branch.

miss-islington pushed a commit that referenced this pull request Oct 7, 2021
@cclauss
[3.9] Fix typos in the Modules directory (GH-28761). (GH-28791)
8f76234 
(cherry picked from commit dd02a69)

Co-authored-by: Christian Clauss <cclauss@me.com>

Automerge-Triggered-By: GH:JulienPalard
@cclauss cclauss deleted the codespell-Modules branch Oct 7, 2021
@cclauss
Copy link
Contributor Author

cclauss commented Oct 7, 2021 •
edited

Done! Thanks all!

@cclauss cclauss mentioned this pull request Oct 7, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead

@tiran tiran

Assignees

@gpshead gpshead

Labels
docs Documentation in the Doc dir skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@cclauss @gpshead @bedevere-bot @terryjreedy @miss-islington @the-knights-who-say-ni