Replace wchar_t string decoding implementation with a uint32_t-based one#555
Merged
hugovk merged 1 commit intoultrajson:mainfrom Jun 20, 2022
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## main #555 +/- ##
==========================================
+ Coverage 91.81% 91.84% +0.03%
==========================================
Files 6 6
Lines 1856 1852 -4
==========================================
- Hits 1704 1701 -3
+ Misses 152 151 -1
Continue to review full report at Codecov.
|
bwoodsend
reviewed
Jun 19, 2022
This fixes character handling on platforms with 16-bit wchar_t (notably, Windows), which was broken (in different ways) on both CPython and PyPy. Fixes ultrajson#552
JustAnotherArchivist
force-pushed
the
fix-decode-surrogates-2
branch
from
eb9c5c1 to
bc7bdff
Compare
bwoodsend
approved these changes
Jun 20, 2022
Collaborator
bwoodsend
left a comment
bwoodsend
left a comment
There was a problem hiding this comment.
Nice. I was expecting a replacement of all strings to be a much bigger, scarier looking change set.
Collaborator
Author
|
Yeah, much of the code essentially assumed 32-bit ints already for proper operation, so not many changes were needed at all. Also, just realised I forgot about the benchmarks. Some quick tests right now indicate that it's very marginally faster than the previous code by a couple per cent or so. |
adrianeboyd
added a commit
to adrianeboyd/srsly
that referenced
this pull request
Jul 20, 2022
…nt32_t`-based one" Backport ultrajson/ultrajson#555
adrianeboyd
added a commit
to explosion/srsly
that referenced
this pull request
Jul 20, 2022
…nt32_t`-based one" (#67) Backport ultrajson/ultrajson#555
adrianeboyd
added a commit
to adrianeboyd/srsly
that referenced
this pull request
Jul 18, 2023
…nt32_t`-based one" (explosion#67) Backport ultrajson/ultrajson#555
adrianeboyd
added a commit
to adrianeboyd/srsly
that referenced
this pull request
Jul 18, 2023
…nt32_t`-based one" (explosion#67) Backport ultrajson/ultrajson#555
adrianeboyd
added a commit
to adrianeboyd/srsly
that referenced
this pull request
Jul 18, 2023
…nt32_t`-based one" (explosion#67) Backport ultrajson/ultrajson#555
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes character handling on platforms with 16-bit
wchar_t(notably, Windows), which was broken (in different ways) on both CPython and PyPy.Fixes #552
Remarks:
Py_UCS4 == JSUINT32check magic, see the comments on Surrogates fix fails tests with PyPy on Windows #552.PyUnicode_FromWideChardoes some extra work compared toPyUnicode_FromKindAndData(mostly due to surrogate handling). On 16-bitwchar_tplatforms, the larger buffer size might have some impact though; I won't be able to run comparisons for that though, I think.