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

Misc. typos #4275

Merged
merged 5 commits into from Nov 5, 2017
Merged

Misc. typos #4275

merged 5 commits into from Nov 5, 2017

Conversation

luzpaz
Copy link
Contributor

@luzpaz luzpaz commented Nov 4, 2017

Most are trivial. Some are user facing. Found using:
codespell -q 3 -I '../cpy-whitelist.txt'
whereby the whitelist contained:

ans
dum
efford
iff
ot
nto
que
teh
te
thru
upto
whitespaces

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

@the-knights-who-say-ni the-knights-who-say-ni commented Nov 4, 2017

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!

@luzpaz
Copy link
Contributor Author

@luzpaz luzpaz commented Nov 4, 2017

Is it OK if I don't sign CLA.. I hereby release all trivial changes I am requesting for merge to the cpython project.

@@ -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
Copy link
Contributor

@skrah skrah Nov 4, 2017

Choose a reason for hiding this comment

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

The test data is from a third party, so please take this change out. It does not make sense to maintain our own version.

Copy link
Contributor Author

@luzpaz luzpaz Nov 4, 2017

Choose a reason for hiding this comment

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

all test data or just this file?

Copy link
Member

@terryjreedy terryjreedy Nov 4, 2017

Choose a reason for hiding this comment

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

I am sure just this file.

@terryjreedy terryjreedy requested a review from vstinner Nov 4, 2017
Copy link
Member

@terryjreedy terryjreedy left a comment

With the exception of the ambigous 'catched', the replacements are correct.

@@ -2770,7 +2770,7 @@ def __init__(self):
import signal
self.signal = signal
self.signals = list(range(1, signal.NSIG))
# SIGKILL and SIGSTOP signals cannot be ignored nor catched
# SIGKILL and SIGSTOP signals cannot be ignored nor caught
Copy link
Member

@terryjreedy terryjreedy Nov 4, 2017

Choose a reason for hiding this comment

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

'catched' might be a misspelling of 'cached' rather than 'caught'. Victor Stinner might be the one who knows.

Copy link
Member

@gpshead gpshead Nov 4, 2017

Choose a reason for hiding this comment

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

this edit is correct: "caught" was intended.

Copy link
Member

@vstinner vstinner Nov 6, 2017

Choose a reason for hiding this comment

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

Oops, irregular verb: caught is correct ;-)

@@ -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
Copy link
Member

@terryjreedy terryjreedy Nov 4, 2017

Choose a reason for hiding this comment

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

I am sure just this file.

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Nov 4, 2017

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 terryjreedy commented Nov 4, 2017

Luzpaz: is your reluctance to sign the CLA the inconvenience of setting up a bpo account, or an objection to the CLA itself? (The actual e-signing is pretty trivial.)

If you only had submitted a couple of typos, there would be no issue (other than the fact we would hope to see more submissions from you). I am not sure about 58 (but please don't split this into 29 obviously trivial PRs ;-). Brett, your bot -- what is your opinion?

it comes from an external source so we should leave the typo as is.
@terryjreedy
Copy link
Member

@terryjreedy terryjreedy commented Nov 4, 2017

The Travis failure is due to whitespace issues for
Include/pymem.h
Modules/_posixsubprocess.c
These were probably pre-existing. I will see if patchcheck on Windows fixes them.

gpshead
gpshead approved these changes Nov 4, 2017
@gpshead
Copy link
Member

@gpshead gpshead commented Nov 4, 2017

FWIW as all of these are trivially correct obvious documentation or comment typo fixes my inclination is to not worry about the CLA being signed regardless of number of files. I'll be happy to merge this either way.

Doc/license.rst Outdated
@@ -788,7 +788,7 @@ of the OpenSSL license here::
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* The licence and distribution terms for any publically available version or
* The licence and distribution terms for any publicly available version or
Copy link
Member

@serhiy-storchaka serhiy-storchaka Nov 4, 2017

Choose a reason for hiding this comment

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

You can't just change the license text, especially if this is a license of imported code.

@@ -164,7 +164,7 @@ each with their own argument patterns and help displays::

$ ./helm.py --help # top level help (launch and move)
$ ./helm.py launch --help # help for launch options
$ ./helm.py launch --missiles # set missiles=True and torpedos=False
$ ./helm.py launch --missiles # set missiles=True and torpedoes=False
Copy link
Member

@serhiy-storchaka serhiy-storchaka Nov 4, 2017

Choose a reason for hiding this comment

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

The option name is torpedos.

aclocal.m4 Outdated
@@ -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
Copy link
Member

@serhiy-storchaka serhiy-storchaka Nov 4, 2017

Choose a reason for hiding this comment

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

Isn't this an imported file?

@@ -1504,7 +1504,7 @@ argument taking an iterable of handlers to be added to the root logger.
A class level attribute :attr:`~logging.handlers.SysLogHandler.append_nul` has
been added to :class:`~logging.handlers.SysLogHandler` to allow control of the
appending of the ``NUL`` (``\000``) byte to syslog records, since for some
deamons it is required while for others it is passed through to the log.
daemons it is required while for others it is passed through to the log.
Copy link
Member

@serhiy-storchaka serhiy-storchaka Nov 4, 2017

Choose a reason for hiding this comment

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

Please fix the same typo in Lib/test/test_threading.py.

Copy link
Contributor Author

@luzpaz luzpaz Nov 4, 2017

Choose a reason for hiding this comment

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

@serhiy-storchaka apologies, are you saying that daemons is correct here?
and in regards to Lib/test/test_threading.py i should fix:

def test_deamon_param(self):

so that it shows:
def test_daemon_param(self):

Copy link
Member

@gpshead gpshead left a comment

awaiting resolution of Serhiy's comments.

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Nov 4, 2017

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.

@luzpaz
Copy link
Contributor Author

@luzpaz luzpaz commented Nov 4, 2017

I will resubmit PR very soon with requested changes.

@terryjreedy
Copy link
Member

@terryjreedy terryjreedy commented Nov 4, 2017

I hope you mean to push a new commit to this PR rather than closing this and submitting a new PR.

@luzpaz
Copy link
Contributor Author

@luzpaz luzpaz commented Nov 5, 2017

I have made the requested changes; please review again

Sorry folks, my git-fu skills are pretty sad. Not sure how to squash everything in to 1 commit at this moment.

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Nov 5, 2017

Thanks for making the requested changes!

@gpshead, @terryjreedy: please review the changes made to this pull request.

Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Thank you. You shouldn't squash everything into 1 commit. It is easier to review if keep separate incremental changes. All this will be squashed into 1 commit when be merged into master.

@serhiy-storchaka serhiy-storchaka merged commit a5293b4 into python:master Nov 5, 2017
4 checks passed
@luzpaz luzpaz deleted the typos branch Nov 5, 2017
terryjreedy added a commit to terryjreedy/cpython that referenced this issue Nov 5, 2017
Manual partial backport of patch that fixed nearly 50 other files.
terryjreedy added a commit that referenced this issue Nov 6, 2017
Manual partial backport of patch that fixed nearly 50 other files.
Copy link
Member

@vstinner vstinner left a comment

I plead guilty for "informations": I cannot accept that it's not possible to put a S to information in english! Sorry, I'm french :-)

@@ -2770,7 +2770,7 @@ def __init__(self):
import signal
self.signal = signal
self.signals = list(range(1, signal.NSIG))
# SIGKILL and SIGSTOP signals cannot be ignored nor catched
# SIGKILL and SIGSTOP signals cannot be ignored nor caught
Copy link
Member

@vstinner vstinner Nov 6, 2017

Choose a reason for hiding this comment

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

Oops, irregular verb: caught is correct ;-)

@vstinner
Copy link
Member

@vstinner vstinner commented Nov 6, 2017

Thanks for fixing all these typos!

embray pushed a commit to embray/cpython that referenced this issue Nov 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants