Skip to content

fix minor error in json module docstring#2274

Merged
Mariatta merged 1 commit intopython:masterfrom
jiangying000:patch-1
Jun 20, 2017
Merged

fix minor error in json module docstring#2274
Mariatta merged 1 commit intopython:masterfrom
jiangying000:patch-1

Conversation

@jiangying000
Copy link
Copy Markdown
Contributor

@jiangying000 jiangying000 commented Jun 19, 2017

fix typo

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

the-knights-who-say-ni commented Jun 19, 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!

@methane methane changed the title Update __init__.py fix minor error in json module docstring Jun 19, 2017
@jiangying000
Copy link
Copy Markdown
Contributor Author

jiangying000 commented Jun 19, 2017

@the-knights-who-say-ni I just signed CLA

@serhiy-storchaka serhiy-storchaka added docs Documentation in the Doc dir needs backport to 2.7 labels Jun 20, 2017
@Mariatta Mariatta merged commit 76c567e into python:master Jun 20, 2017
@Mariatta
Copy link
Copy Markdown
Member

Mariatta commented Jun 20, 2017

Thanks @dong-jy and congrats on your first contribution to CPython 🎉
Can you also please backport this to the other branches?
You can use cherry_picker script to backport.
Thanks.

Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Jun 27, 2017
@jiangying000 @Mariatta
[3.6] Fix trivial typo in json module docstring (pythonGH-2274)
633b413 
(cherry picked from commit 76c567e)
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Jun 27, 2017
@jiangying000 @Mariatta
[3.5] Fix trivial typo in json module docstring (pythonGH-2274)
5b2538a 
(cherry picked from commit 76c567e)
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 27, 2017

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

Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Jun 27, 2017
@jiangying000 @Mariatta
[2.7] Fix trivial typo in json module docstring (pythonGH-2274)
23302c1 
(cherry picked from commit 76c567e)
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 27, 2017

GH-2431 is a backport of this pull request to the 3.5 branch.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 27, 2017

GH-2432 is a backport of this pull request to the 2.7 branch.

ned-deily pushed a commit that referenced this pull request Jul 1, 2017
@Mariatta @ned-deily
[3.6] Fix trivial typo in json module docstring (GH-2274) (#2430)
48290c1 
(cherry picked from commit 76c567e)
Mariatta added a commit that referenced this pull request Jul 6, 2017
@Mariatta
Fix trivial typo in json module docstring (GH-2274) (GH-2431)
10df96a 
(cherry picked from commit 76c567e)
Mariatta added a commit that referenced this pull request Jul 6, 2017
@Mariatta
Fix trivial typo in json module docstring (GH-2274) (GH-2432)
af6c547 
(cherry picked from commit 76c567e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@methane methane methane approved these changes

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

No one assigned

Labels

docs Documentation in the Doc dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jiangying000 @the-knights-who-say-ni @Mariatta @bedevere-bot @methane @serhiy-storchaka