bpo-32072: Fix issues with binary plists. #4455
Merged
Conversation
This file contains 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
* Fixed saving bytearrays. * Identical objects will be saved only once. * Equal references will be load as identical objects. * Added support for saving and loading recursive data structures.
serhiy-storchaka
added
needs backport to 3.6
type-bug
ronaldoussoren
approved these changes
Nov 29, 2017
Lib/plistlib.py
Outdated
| result = [] | ||
| self._objects[ref] = result | ||
| result.extend(self._read_object(x) for x in obj_refs) | ||
| return result |
There was a problem hiding this comment.
Why the return statement? This saves a duplicate store to self._objects[ref] at the end of the method, but makes handling this token different from he previous ones.
There was a problem hiding this comment.
The tokens "array" and "dict" are special. Since they are containers and can contain a cyclic reference to itself, self._objects[ref] should be set before reading the content. These tokens already handled different from tokens for scalar types, and the difference will be kept even if remove the return statement here.
Lib/plistlib.py
Outdated
| for k, o in zip(key_refs, obj_refs): | ||
| result[self._read_object(self._object_offsets[k]) | ||
| ] = self._read_object(self._object_offsets[o]) | ||
| result[self._read_object(k)] = self._read_object(o) | ||
| return result |
There was a problem hiding this comment.
I guess the same applies to this (existing) return statement.
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 30, 2017
* Fixed saving bytearrays. * Identical objects will be saved only once. * Equal references will be load as identical objects. * Added support for saving and loading recursive data structures. (cherry picked from commit a897aee)
|
GH-4654 is a backport of this pull request to the 3.6 branch. |
|
Thank you for your review @ronaldoussoren. |
serhiy-storchaka
added a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Nov 30, 2017
* Fixed saving bytearrays. * Identical objects will be saved only once. * Equal references will be load as identical objects. * Added support for saving and loading recursive data structures. (cherry picked from commit a897aee)
serhiy-storchaka
added a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Nov 30, 2017
* Fixed saving bytearrays. * Identical objects will be saved only once. * Equal references will be load as identical objects. * Added support for saving and loading recursive data structures.. (cherry picked from commit a897aee)
serhiy-storchaka
pushed a commit
that referenced
this pull request
Nov 30, 2017
larryhastings
pushed a commit
that referenced
this pull request
Jan 22, 2018
* [3.4] bpo-32072: Fix issues with binary plists. (GH-4455) * Fixed saving bytearrays. * Identical objects will be saved only once. * Equal references will be load as identical objects. * Added support for saving and loading recursive data structures.. (cherry picked from commit a897aee) * Fix implementation dependent assertion in test_plistlib. (#4813) It is failed with an advanced optimizer.
larryhastings
pushed a commit
that referenced
this pull request
Jan 23, 2018
* [3.5] bpo-32072: Fix issues with binary plists. (GH-4455) * Fixed saving bytearrays. * Identical objects will be saved only once. * Equal references will be load as identical objects. * Added support for saving and loading recursive data structures. (cherry picked from commit a897aee) * Fix implementation dependent assertion in test_plistlib. (#4813) It is failed with an advanced optimizer.
serhiy-storchaka
pushed a commit
that referenced
this pull request
Nov 1, 2019
* Add missing test class (mistake in GH-4455) * Increase coverage with 4 more test cases * Rename neg_uid to huge_uid in test_modified_uid_huge * Replace test_main() with unittest.main() * Update plistlib docs
jacobneiltaylor
pushed a commit
to jacobneiltaylor/cpython
that referenced
this pull request
Dec 5, 2019
* Add missing test class (mistake in pythonGH-4455) * Increase coverage with 4 more test cases * Rename neg_uid to huge_uid in test_modified_uid_huge * Replace test_main() with unittest.main() * Update plistlib docs
shihai1991
pushed a commit
to shihai1991/cpython
that referenced
this pull request
Jan 31, 2020
* Add missing test class (mistake in pythonGH-4455) * Increase coverage with 4 more test cases * Rename neg_uid to huge_uid in test_modified_uid_huge * Replace test_main() with unittest.main() * Update plistlib docs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://bugs.python.org/issue32072