Skip to content

Update json from 3.13.5 #6007

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

Merged
youknowone merged 4 commits into from
Jul 20, 2025
Merged

Update json from 3.13.5 #6007

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f267b2
Update `json` from 3.13.5
ShaharNaveh Jul 20, 2025
e385ffc
Apply RUSTPYTHON specific method
ShaharNaveh Jul 20, 2025
db7406a
Update `test_json` from 3.13.5
ShaharNaveh Jul 20, 2025
8e3f42a
Mark failing tests
ShaharNaveh Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply RUSTPYTHON specific method
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jul 20, 2025
commit e385ffc7c03e3cdce7ab23416b25784a1839ed8a
14 changes: 14 additions & 0 deletions Lib/json/decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ class JSONDecodeError(ValueError):
colno: The column corresponding to pos

"""
# RUSTPYTHON SPECIFIC
@classmethod
def _from_serde(cls, msg, doc, line, col):
pos = 0
# 0-indexed
line -= 1
col -= 1
while line > 0:
i = doc.index('\n', pos)
line -= 1
pos = i
pos += col
return cls(msg, doc, pos)

# Note that this exception is used from _json
def __init__(self, msg, doc, pos):
lineno = doc.count('\n', 0, pos) + 1
Expand Down