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

gh-101440: fix json snippet error in logging-cookbook.rst #101439

Merged

Conversation

peterjpxie
Copy link
Contributor

@peterjpxie peterjpxie commented Jan 30, 2023

@peterjpxie peterjpxie requested a review from vsajip as a code owner January 30, 2023 22:32
@bedevere-bot bedevere-bot added awaiting review docs Documentation in the Doc dir skip news labels Jan 30, 2023
@peterjpxie peterjpxie changed the title fix json snippet error in logging-cookbook.rst gh-101440: fix json snippet error in logging-cookbook.rst Jan 30, 2023
Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

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

This was not a valid JSON, trailing commas are not allowed (except for json5).

Thanks!

@hugovk hugovk merged commit 20c11f2 into python:main Jan 31, 2023
@miss-islington
Copy link
Contributor

Thanks @peterjpxie for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-101463 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jan 31, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 31, 2023
@bedevere-bot
Copy link

GH-101464 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jan 31, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 31, 2023
miss-islington added a commit that referenced this pull request Jan 31, 2023
(cherry picked from commit 20c11f2)

Co-authored-by: Peter Jiping Xie <[email protected]>
miss-islington added a commit that referenced this pull request Jan 31, 2023
…101439) (GH-101463)

(cherry picked from commit 20c11f2)

Co-authored-by: Peter Jiping Xie <[email protected]>

Automerge-Triggered-By: GH:hugovk
carljm added a commit to carljm/cpython that referenced this pull request Jan 31, 2023
* main:
  pythongh-101440: fix json snippet error in logging-cookbook.rst (python#101439)
  pythongh-99276 - Updated Doc/faq/general.rst (python#101396)
  Add JOBS parameter to docs Makefile (python#101395)
  pythongh-98831: rewrite GET_LEN, GET_ITER, BEFORE_WITH and a few simple opcodes in the instruction definition DSL (python#101443)
  pythongh-77607: Improve accuracy of os.path.join docs (python#101406)
  Fixes typo in asyncio.TaskGroup context manager code example (python#101449)
  pythongh-98831: Clean up and add cache size static_assert to macro (python#101442)
  pythongh-99955: use SUCCESS/ERROR return values in optimizer and assembler. Use RETURN_IF_ERROR where appropriate. Fix a couple of bugs. (python#101412)
@peterjpxie peterjpxie deleted the fix_json_error_in_logging-cookbook.rst branch March 25, 2023 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants