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

bpo-17909: Document that json.load can accept a binary IO #7366

Merged
merged 1 commit into from Jun 7, 2018

Conversation

@asottile
Copy link
Contributor

commented Jun 3, 2018

@@ -262,6 +262,11 @@ Basic Usage
.. versionchanged:: 3.6
All optional parameters are now :ref:`keyword-only <keyword-only_parameter>`.

.. versionchanged:: 3.6
*fp* can now be a :term:`file-like object` whose ``.read()`` method

This comment has been minimized.

Copy link
@serhiy-storchaka

serhiy-storchaka Jun 4, 2018

Member

Why not use just :term:`binary file`?

This comment has been minimized.

Copy link
@asottile

asottile Jun 4, 2018

Author Contributor

I can go with that, was mostly matching the verbiage above (load after all only cares that the object has a .read() method)

@@ -262,6 +262,10 @@ Basic Usage
.. versionchanged:: 3.6
All optional parameters are now :ref:`keyword-only <keyword-only_parameter>`.

.. versionchanged:: 3.6
*fp* can now be a :term:`binary file`. The input encoding should be
UTF-8, UTF-16 or UTF-32.

This comment has been minimized.

Copy link
@vstinner

vstinner Jun 4, 2018

Member

IMHO the feature should also be documented in the body of the function documentation, not also in this versionchanged note.

This comment has been minimized.

Copy link
@asottile

asottile Jun 4, 2018

Author Contributor

agreed, added!

@asottile asottile force-pushed the asottile:document_json_binary_io branch from dd11bbf to e976fea Jun 4, 2018
@asottile

This comment has been minimized.

Copy link
Contributor Author

commented Jun 6, 2018

@vstinner @serhiy-storchaka look good now?

Copy link
Member

left a comment

LGTM.

@methane methane merged commit bb6366b into python:master Jun 7, 2018
9 checks passed
9 checks passed
VSTS: Linux-PR Linux-PR_20180604.42 succeeded
Details
VSTS: Linux-PR-Coverage Linux-PR-Coverage_20180604.56 succeeded
Details
VSTS: Windows-PR Windows-PR_20180604.42 succeeded
Details
VSTS: docs docs_20180604.75 succeeded
Details
VSTS: macOS-PR macOS-PR_20180604.42 succeeded
Details
bedevere/issue-number Issue number 17909 found
Details
bedevere/news "skip news" label found
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington

This comment has been minimized.

Copy link

commented Jun 7, 2018

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

miss-islington added a commit to miss-islington/cpython that referenced this pull request Jun 7, 2018
)

(cherry picked from commit bb6366b)

Co-authored-by: Anthony Sottile <asottile@umich.edu>
@bedevere-bot

This comment has been minimized.

Copy link

commented Jun 7, 2018

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

@bedevere-bot

This comment has been minimized.

Copy link

commented Jun 7, 2018

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

miss-islington added a commit to miss-islington/cpython that referenced this pull request Jun 7, 2018
)

(cherry picked from commit bb6366b)

Co-authored-by: Anthony Sottile <asottile@umich.edu>
miss-islington added a commit that referenced this pull request Jun 7, 2018
(cherry picked from commit bb6366b)

Co-authored-by: Anthony Sottile <asottile@umich.edu>
miss-islington added a commit that referenced this pull request Jun 7, 2018
(cherry picked from commit bb6366b)

Co-authored-by: Anthony Sottile <asottile@umich.edu>
@asottile asottile deleted the asottile:document_json_binary_io branch Jun 18, 2018
lisroach added a commit to lisroach/cpython that referenced this pull request Sep 10, 2018
yahya-abou-imran added a commit to yahya-abou-imran/cpython that referenced this pull request Nov 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.