gh-113028: correctly memoize str when escapes added #113436
Merged
Conversation
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
This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped.
Contributor Author
| Making this draft while I blurb it. |
serhiy-storchaka added awaiting review needs backport to 3.11 
thesayfulla approved these changes Dec 24, 2023
| Thanks @jeff5 for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12. |
| GH-113448 is a backport of this pull request to the 3.12 branch. |
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 24, 2023
…ythonGH-113436) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped. (cherry picked from commit 0839863) Co-authored-by: Jeff Allen <ja.py@farowl.co.uk>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 24, 2023
…ythonGH-113436) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped. (cherry picked from commit 0839863) Co-authored-by: Jeff Allen <ja.py@farowl.co.uk>
| GH-113449 is a backport of this pull request to the 3.11 branch. |
serhiy-storchaka pushed a commit that referenced this pull request Dec 24, 2023
…H-113436) (GH-113448) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped. (cherry picked from commit 0839863) Co-authored-by: Jeff Allen <ja.py@farowl.co.uk>
serhiy-storchaka pushed a commit that referenced this pull request Dec 24, 2023
…H-113436) (GH-113449) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped. (cherry picked from commit 0839863) Co-authored-by: Jeff Allen <ja.py@farowl.co.uk>
ryan-duve pushed a commit to ryan-duve/cpython that referenced this pull request Dec 26, 2023
…ythonGH-113436) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped.
kulikjak pushed a commit to kulikjak/cpython that referenced this pull request Jan 22, 2024
…ythonGH-113436) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped.
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
…ythonGH-113436) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped.
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
…ythonGH-113436) This fixes a divergence between the Python and C implementations of pickle for protocol 0, such that it pickle.py fails to re-use the first pickled representation of strings involving characters that have to be escaped.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 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.
Ensure that when pickling a str using the Python implementation in pickle.py, the original object is made the memo key (as in the C version), rather than the replacement, which when escape sequences are added. The result is that a second reference to a string in the input will un-pickle as a repeat reference, rather than as a duplicate object. The change also adds a test for this.
Fixes #113028 .