Fixed #30159 -- Removed obsolete use of OrderedDict with Python 3.6+. #10945
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
timgraham
approved these changes
Feb 5, 2019
django/contrib/admin/options.py
Outdated
| (name, (func, name, desc)) | ||
| for func, name, desc in actions | ||
| ) | ||
| # Convert the actions into a dictionary keyed by name. |
There was a problem hiding this comment.
Maybe that comment could be removed as the dict comprehension seems somewhat obvious.
django/core/serializers/pyyaml.py
Outdated
| @@ -35,6 +35,10 @@ def represent_ordered_dict(self, data): | |||
| DjangoSafeDumper.add_representer(decimal.Decimal, DjangoSafeDumper.represent_decimal) | |||
| DjangoSafeDumper.add_representer(collections.OrderedDict, DjangoSafeDumper.represent_ordered_dict) | |||
|
|
|||
| ((COMPILED_REGEX_TYPE, RegexObject), RegexSerializer), | ||
| (uuid.UUID, UUIDSerializer), | ||
| ]) | ||
| _registry = { |
There was a problem hiding this comment.
I would restore the "some of these are order-dependent." comment that was removed in 7d3b389 as it may not be obvious without OrderedDict.
timgraham
force-pushed
the
ticket-30159
branch
from
f8cada4
to
d68c913
Compare
Dicts preserve order since Python 3.6.
timgraham
force-pushed
the
ticket-30159
branch
from
d68c913
to
24b82cd
Compare
|
Thanks Tim. |
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.
Ticket #30159.
Follows on from #10894 (comment).
Use of
OrderedDictremains in two places:django.core.cache.backends.locmem-- usesOrderedDict.move_to_end().django.core.serializers.pyyaml-- retain ability to serializeOrderedDict.Some observations:
DeclarativeFieldsMetaclass.__prepare__()as the class namespace is initialised as an empty ordered mapping.object_pairs_hookparameter tojson.loads()inManifestFilesMixin.load_manifest()asdictis the default.django.core.serializers.pyyamlbecause dictionary items are sorted by key, see Allow to turn off sorting keys in Dumper yaml/pyyaml#143.Query.annotationsandQuery.extraare simplified because it is no longer necessary to instantiate anOrderedDictlazily.queries.tests.Queries1Tests.test_ticket2902is obsolete and is removed.