bpo-32746: Fix multiple typos #5144

come-maiz · 2018-01-10T04:12:59Z

Fix typos found by codespell in docs, docstrings, and comments.

https://bugs.python.org/issue32746

Fix typos found by codespell.

the-knights-who-say-ni · 2018-01-10T04:13:02Z

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

terryjreedy

All the changes are correct. Perhaps "that is" in 2 places would be even better than "that's". So 'Approved' once this change is considered.

terryjreedy · 2018-01-10T08:23:57Z

Lib/unittest/test/test_discovery.py

@@ -199,7 +199,7 @@ def loadTestsFromModule(module, pattern=None):
                         ['a_directory', 'test_directory', 'test_directory2'])

        # load_tests should have been called once with loader, tests and pattern
-        # (but there are no tests in our stub module itself, so thats [] at the
+        # (but there are no tests in our stub module itself, so that's [] at the


'that is' would maybe be even better

skrah · 2018-01-10T10:57:37Z

Lib/test/decimaltestdata/abs.decTest

@@ -20,7 +20,7 @@
 version: 2.59

 -- This set of tests primarily tests the existence of the operator.
-- Additon, subtraction, rounding, and more overflows are tested


This is an external source. I would prefer not to maintain our own version, even for typos.

ericvsmith

See _ctypes/libffi* comments. At this point we might not be forward or back porting any changes from upstream, but if someone wants to eventually do that or to use a new version, any extra diffs are going to make the task more difficult.

ericvsmith · 2018-01-10T12:03:06Z

Modules/_ctypes/libffi_msvc/win32.c

@@ -2,21 +2,21 @@
   win32.S - Copyright (c) 1996, 1998, 2001, 2002  Red Hat, Inc.
 	     Copyright (c) 2001  John Beniton
 	     Copyright (c) 2002  Ranjit Mathew
-


I realize we have our own copy of libffi for Windows. Wouldn't changes to these files cause porting upstream changes more difficult? I suggest we not change any libffi files. See Modules/_ctypes/libffi_osx/README.ctypes.

ericvsmith · 2018-01-10T12:03:06Z

Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c

@@ -650,7 +650,7 @@ ffi_call(
 		  +---------------------------------------+ 160
 		  | result area 8                         |
 		  +---------------------------------------+ 168
-		  | alignement to the next multiple of 16 |


Same comment with this file:

I realize we have our own copy of libffi for OS-X. Wouldn't changes to these files cause porting upstream changes more difficult? I suggest we not change any libffi files. See Modules/_ctypes/libffi_osx/README.pyobjc.

bedevere-bot · 2018-01-10T12:03:08Z

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.

srinivasreddy · 2018-01-10T21:10:09Z

Doc/library/ossaudiodev.rst

@@ -447,4 +447,3 @@ The remaining methods are specific to audio mixing:
   microphone input::

      mixer.setrecsrc (1 << ossaudiodev.SOUND_MIXER_MIC)
-


Pls do not remove existing lines. In other places too

I can revert this, but I'm curious, why do you want two empty lines at the bottom?

I am sorry. I didn't look at the file. If it is at bottom, you can keep it. I am worried about introducing unnecessary git diffs in the middle of a file.

srinivasreddy

LGTM 👍

OBE: libffi changes were removed.

terryjreedy · 2018-02-02T04:50:20Z

Leo, it might have been better to open a bpo issue for changes to this many files, but I don't think it necessary now, so I am adding the skip labels now. I found your bpo user listing, with the same user name, but there is no indication you have signed the CLA. It would not be needed for any one of the typo fixes, so unless objects, I would let that pass.

The conflict in aclocal.m4 appeared to be because someone added, since this patch,

<blank line>
m4_include([m4/ax_check_openssl.m4])

at the bottom of the file, which conflicted with your removal of an extra blank line at the bottom without the context of the new line. In any case, I removed the context markers and left the addition alone. This should be rechecked after the retesting.

the-knights-who-say-ni · 2018-02-02T04:51:35Z

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately our records indicate you have not signed the CLA. For legal reasons we need you to sign this before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

terryjreedy · 2018-02-02T05:09:34Z

A few changes have been reverted. Does anything think anything else should be?

terryjreedy · 2018-02-02T06:11:17Z

I decided a) to open an issue and b) to make this strictly about typos. After previous changes, there was only one whitespace deletion left (\n at the end of a data file).

serhiy-storchaka · 2018-02-02T06:28:10Z

Lib/opcode.py

@@ -142,7 +142,7 @@ def jabs_op(name, op):
 def_op('BUILD_TUPLE', 102)      # Number of tuple items
 def_op('BUILD_LIST', 103)       # Number of list items
 def_op('BUILD_SET', 104)        # Number of set items
-def_op('BUILD_MAP', 105)        # Number of dict entries (upto 255)
+def_op('BUILD_MAP', 105)        # Number of dict entries (up to 255)


"(up to 255)" is outdated (in 3.6 too). Just remove it.

elopio or whoever makes the change should refresh the patch against master.

serhiy-storchaka · 2018-02-02T06:28:10Z

Lib/unittest/test/test_discovery.py

-        # (but there are no tests in our stub module itself, so thats [] at the
-        # time of call.
+        # (but there are no tests in our stub module itself, so that is [] at
+        # the time of call.


Close parenthesis.

serhiy-storchaka · 2018-02-02T06:28:10Z

aclocal.m4

@@ -100,7 +100,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place


Shouldn't configure be regenerated now?

I don't know and could not do so. Perhaps this should be reverted and either done separately, for 3.8 only, or left alone.

All 3 changes made. Anyone who wants to fix 'occurence' in aclocal.m4 for 3.8 and regenerate configure or whatever should do so separately.

miss-islington · 2018-02-04T00:36:13Z

Thanks @ElOpio for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

Fix typos found by codespell in docs, docstrings, and comments. (cherry picked from commit c3d9508) Co-authored-by: Leo Arias <leo.arias@canonical.com>

bedevere-bot · 2018-02-04T00:37:22Z

GH-5520 is a backport of this pull request to the 3.7 branch.

miss-islington · 2018-02-04T00:38:15Z

Sorry, @ElOpio and @terryjreedy, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c3d9508ff22ece9a96892b628dd5813e2fb0cd80 3.6

Fix typos found by codespell in docs, docstrings, and comments.. (cherry picked from commit c3d9508)

bedevere-bot · 2018-02-04T01:38:51Z

GH-5522 is a backport of this pull request to the 3.6 branch.

Fix typos found by codespell in docs, docstrings, and comments. (cherry picked from commit c3d9508) Co-authored-by: Leo Arias <leo.arias@canonical.com>

Fix typos found by codespell in docs, docstrings, and comments. Fixes for the following files were in post-3.6 code and not backported: Lib/ctypes/_aix.py (new), Lib/test/test_concurrent_futures.py, Modules/_asynciomodule.c, Modules/_pickle.c, Objects/obmalloc.c. (cherry picked from commit c3d9508)

come-maiz · 2018-02-08T04:00:21Z

thanks everybody!!! hugs

fix multiple typos

d7fc123

Fix typos found by codespell.

come-maiz requested review from 1st1, asvetlov, ericvsmith, rhettinger, skrah, terryjreedy and a team as code owners Jan 10, 2018

bedevere-bot added the awaiting review label Jan 10, 2018

the-knights-who-say-ni added the CLA not signed label Jan 10, 2018

terryjreedy reviewed Jan 10, 2018

View changes

skrah reviewed Jan 10, 2018

View changes

ericvsmith previously requested changes Jan 10, 2018

View changes

bedevere-bot added awaiting changes and removed awaiting review labels Jan 10, 2018

Leo Arias added 3 commits Jan 10, 2018

replace that's with that is

d64a14a

revert the abs.decTest change

27cd045

reverted libffi files

f41d647

srinivasreddy reviewed Jan 10, 2018

View changes

srinivasreddy approved these changes Jan 10, 2018

View changes

phoenix24 approved these changes Jan 17, 2018

View changes

terryjreedy added skip issue skip news and removed CLA not signed labels Feb 2, 2018

Merge branch 'master' into typoss

4488ade

Update aclocal.m4

fd1d61c

terryjreedy added the CLA not signed label Feb 2, 2018

terryjreedy changed the title ~~fix multiple typos~~ bpo-32746: Fix multiple typos Feb 2, 2018

terryjreedy added needs backport to 3.6 needs backport to 3.7 and removed skip issue labels Feb 2, 2018

Update abs.decTest

f64942f

serhiy-storchaka reviewed Feb 2, 2018

View changes

terryjreedy added 2 commits Feb 3, 2018

Merge remote-tracking branch 'upstream/master' into pr_5144

1f7ea65

Delete up to, add ), revert aclocal.m4.

94e2783

terryjreedy merged commit c3d9508 into python:master Feb 4, 2018

bedevere-bot removed the awaiting changes label Feb 4, 2018

bedevere-bot removed the needs backport to 3.7 label Feb 4, 2018

terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Feb 4, 2018

[3.6] bpo-32746: Fix multiple typos (pythonGH-5144)

c62a1cd

Fix typos found by codespell in docs, docstrings, and comments.. (cherry picked from commit c3d9508)

bedevere-bot removed the needs backport to 3.6 label Feb 4, 2018

terryjreedy pushed a commit that referenced this pull request Feb 4, 2018

[3.7] bpo-32746: Fix multiple typos (GH-5144) (GH-5520)

e86db34

Fix typos found by codespell in docs, docstrings, and comments. (cherry picked from commit c3d9508) Co-authored-by: Leo Arias <leo.arias@canonical.com>

come-maiz deleted the typoss branch Feb 8, 2018

bpo-32746: Fix multiple typos #5144

bpo-32746: Fix multiple typos #5144

come-maiz commented Jan 10, 2018 •

edited by bedevere-bot

the-knights-who-say-ni commented Jan 10, 2018

terryjreedy left a comment

terryjreedy Jan 10, 2018

come-maiz Jan 10, 2018

skrah Jan 10, 2018

come-maiz Jan 10, 2018

ericvsmith left a comment

ericvsmith Jan 10, 2018

come-maiz Jan 10, 2018

ericvsmith Jan 10, 2018

come-maiz Jan 10, 2018

bedevere-bot commented Jan 10, 2018

srinivasreddy Jan 10, 2018 •

edited

come-maiz Jan 10, 2018

srinivasreddy Jan 10, 2018

srinivasreddy left a comment

terryjreedy commented Feb 2, 2018 •

edited

the-knights-who-say-ni commented Feb 2, 2018

terryjreedy commented Feb 2, 2018

terryjreedy commented Feb 2, 2018

serhiy-storchaka Feb 2, 2018

terryjreedy Feb 2, 2018

serhiy-storchaka Feb 2, 2018

serhiy-storchaka Feb 2, 2018

terryjreedy Feb 2, 2018

terryjreedy Feb 3, 2018

miss-islington commented Feb 4, 2018

bedevere-bot commented Feb 4, 2018

miss-islington commented Feb 4, 2018

bedevere-bot commented Feb 4, 2018

come-maiz commented Feb 8, 2018

		@@ -447,4 +447,3 @@ The remaining methods are specific to audio mixing:
		microphone input::

		mixer.setrecsrc (1 << ossaudiodev.SOUND_MIXER_MIC)

bpo-32746: Fix multiple typos #5144

bpo-32746: Fix multiple typos #5144

Conversation

come-maiz commented Jan 10, 2018 • edited by bedevere-bot

the-knights-who-say-ni commented Jan 10, 2018

terryjreedy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ericvsmith left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bedevere-bot commented Jan 10, 2018

srinivasreddy Jan 10, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srinivasreddy left a comment

terryjreedy commented Feb 2, 2018 • edited

the-knights-who-say-ni commented Feb 2, 2018

terryjreedy commented Feb 2, 2018

terryjreedy commented Feb 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miss-islington commented Feb 4, 2018

bedevere-bot commented Feb 4, 2018

miss-islington commented Feb 4, 2018

bedevere-bot commented Feb 4, 2018

come-maiz commented Feb 8, 2018

come-maiz commented Jan 10, 2018 •

edited by bedevere-bot

srinivasreddy Jan 10, 2018 •

edited

terryjreedy commented Feb 2, 2018 •

edited