-
-
Notifications
You must be signed in to change notification settings - Fork 33.4k
Docs: fix a form error and a grammatical error in float.rst #140989
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
base: main
Are you sure you want to change the base?
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
skirpichev
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And there is a merge conflict.
Doc/c-api/float.rst
Outdated
| exception. | ||
| Note that NaNs type may not be preserved on IEEE platforms (silent NaN become | ||
| Note that NaN types may not be preserved on IEEE platforms (silent NaN become |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| Note that NaN types may not be preserved on IEEE platforms (silent NaN become | |
| Note that NaN type may not be preserved on IEEE platforms (silent NaN become |
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, I think NaN type is better.
| The pack routines write 2, 4 or 8 bytes, starting at *p*. *le* is an | ||
| :c:expr:`int` argument, non-zero if you want the bytes string in little-endian | ||
| format (exponent last, at ``p+1``, ``p+3``, or ``p+6`` ``p+7``), zero if you | ||
| format (exponent last, at ``p+1``, ``p+3``, or ``p+6`` and ``p+7``), zero if you |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| format (exponent last, at ``p+1``, ``p+3``, or ``p+6`` and ``p+7``), zero if you | |
| format (exponent last, at ``p+1``, ``p+3``, or ``p+6``, ``p+7``), zero if you |
|
And you said that there is a merge conflict. So is there anything I can do? |
|
You can resolve merge conflict. |
|
Sorry, but how can I resolve it? I mean this is the first time I meet the merge conflict problem, and I just checked my python repo branches list, there is no problem. So do you mean I can't fix two issues in one PR? |
|
You can just push "Resolve conflict" button in your pr: Or do it from the command-line: |
|
Okay, so what about now? |
Doc/c-api/float.rst
Outdated
| Note that NaNs type may not be preserved on IEEE platforms (signaling NaN become | ||
| quiet NaN), for example on x86 systems in 32-bit mode. | ||
| Note that NaN types may not be preserved on IEEE platforms (silent NaN become |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, no. Now you reverted back change from #141179. Plese undo this.
Corrected the description of NaN type preservation on IEEE platforms.
|
Okay, I just reverted back the change and change NaNs type to NaN type. |
|
Emm.. So is it the time to merge my PR? I think there is no problem right? |
|
PR must be approved and merged by core developer. |
|
Yes, I know that. |
📚 Documentation preview 📚: https://cpython-previews--140989.org.readthedocs.build/