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.

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

bpo-30721: Addresses minor fixes of adding ? to redirection syntax #3131

Merged
merged 2 commits into from
Aug 18, 2017
Merged

bpo-30721: Addresses minor fixes of adding ? to redirection syntax #3131

merged 2 commits into from
Aug 18, 2017

Conversation

CuriousLearner
Copy link
Member

@CuriousLearner CuriousLearner commented Aug 18, 2017 •
edited by bedevere-bot
Loading

Addresses the minor fixes for PR #2345

cc @ncoghlan

https://bugs.python.org/issue30721

ncoghlan
ncoghlan requested changes Aug 18, 2017
View reviewed changes
Copy link
Contributor

@ncoghlan ncoghlan left a comment

Choose a reason for hiding this comment

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

While English does in general suggest that trailing punctuation should go inside quotation marks (although I've never personally understood that guideline), in this case it should definitely be outside, as what's inside is expected to be a Python expression, not English text.

Objects/abstract.c Outdated
@@ -827,7 +827,7 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
PyErr_Format(PyExc_TypeError,
"unsupported operand type(s) for %.100s: "
"'%.100s' and '%.100s'. Did you mean \"print(<message>, "
"file=<output_stream>)\"",
"file=<output_stream>)?\"",
Copy link
Contributor

Choose a reason for hiding this comment

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

The question mark should be outside the quote marks, since it isn't part of the suggested Python code.

@bedevere-bot
Copy link

A Python core developer, ncoghlan, 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 didn't expect the Spanish Inquisition!
I will then notify ncoghlan along with any other core developers
who have left a review that you're ready for them to take another look
at this pull request.

@CuriousLearner
Copy link
Member Author

I didn't expect the Spanish Inquisition!

@bedevere-bot
Copy link

Nobody expects the Spanish Inquisition!

@ncoghlan: please review the changes made to this pull request.

@ncoghlan ncoghlan merged commit a7c449b into python:master Aug 18, 2017
@CuriousLearner
Copy link
Member Author

Thanks @ncoghlan :)

ncoghlan pushed a commit to ncoghlan/cpython that referenced this pull request Aug 19, 2017
@CuriousLearner @ncoghlan
bpo-30721: Add missing '?' to new error message (pythonGH-3131)
c6ff845
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncoghlan ncoghlan ncoghlan approved these changes

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@CuriousLearner @bedevere-bot @ncoghlan @Mariatta @the-knights-who-say-ni