Use OrderedDict for raw per-module options to preserve section order #3678
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
ilinum
approved these changes
Jul 7, 2017
mypy/options.py
Outdated
|
|
||
| # Per-module options (raw) | ||
| self.per_module_options = {} # type: Dict[Pattern[str], Dict[str, object]] | ||
| self.per_module_options = collections.OrderedDict() # type: MutableMapping[Pattern[str], Dict[str, object]] |
There was a problem hiding this comment.
What's the reason to use MutableMapping?
Dict should still work, right?
There was a problem hiding this comment.
I think we should consider making this of type OrderedDict, because that's important for the semantics.
|
Yes, Dict still works, but the call sites don't need it -- MutableMapping
is sufficient. Or maybe we should specify OrderedDict in the annotation
too? (Note that for the value type we have to use exactly Dict because of
invariance.)
|
ddfisher
approved these changes
Jul 11, 2017
mypy/options.py
Outdated
|
|
||
| # Per-module options (raw) | ||
| self.per_module_options = {} # type: Dict[Pattern[str], Dict[str, object]] | ||
| self.per_module_options = collections.OrderedDict() # type: MutableMapping[Pattern[str], Dict[str, object]] |
There was a problem hiding this comment.
I think we should consider making this of type OrderedDict, because that's important for the semantics.
|
Agreed, pushed a fix. Will merge myself once tests pass. |
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.
Fixes #3675.
Note that the problem only occurs on Python 3.5 and earlier, since in Python 3.6 the standard
dicttype preserves order. Also note that this relies onConfigParserpreserving order -- which it does (it usesOrderedDictfor everything by default).