gh-139423: Fix plistlib to preserve carriage returns in XML plist round-trips#148305
Open
gaweng wants to merge 1 commit intopython:mainfrom
Open
gh-139423: Fix plistlib to preserve carriage returns in XML plist round-trips#148305gaweng wants to merge 1 commit intopython:mainfrom
gaweng wants to merge 1 commit intopython:mainfrom
Conversation
…st round-trips plistlib's _escape() function was normalizing \r\n to \n and \r to \n during XML plist serialization. When the plist was loaded back, the original carriage return characters were lost because expat also normalizes newlines in XML character data. Fix by encoding \r as the XML character reference &python#13; instead of converting it to \n. Character references are not subject to XML newline normalization, so expat correctly decodes &python#13; back to \r, preserving the original data during round-trips.
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
1 participant
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.
plistlib's _escape() function was normalizing \r\n to \n and \r to \n during XML plist serialization. When the plist was loaded back, the original carriage return characters were lost because expat also normalizes newlines in XML character data.
Fix by encoding \r as the XML character reference instead of converting it to \n. Character references are not subject to XML newline normalization, so expat correctly decodes back to \r, preserving the original data during round-trips.