Charclass: type signatures and fixed types #83
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
This makes it possible to fix some type errors by distinguishing the argument types and attribute types.
This fixes some type errors in which it previously could not accept e.g. a `set`, or which failed to recognize that `Charclass.chars` was always a `frozenset`.
The `key` iterator was reused for several different loops. Originally the type is inferred as a Charclass, but the keys to the `escapes` mapping is `str`.
This allows mypy --strict to pass on greenery/charclass*
qntm
approved these changes
Mar 11, 2023
| @@ -191,9 +191,9 @@ def match_charclass(string: str, i): | |||
| pass | |||
|
|
|||
| # e.g. if seeing "\\t", return "\t" | |||
| for key in escapes.keys(): | |||
| for ekey in escapes.keys(): | |||
There was a problem hiding this comment.
Is key a reserved name in Python these days?
There was a problem hiding this comment.
No, it was a local name bound to a different type in previous loop expressions in the same function.
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.
This fixes the types of the arguments and attributes of
Charclass.The constructor now accepts a general
Iterable[str]and exposes afrozenset[str].It also raises slightly more-specific
TypeError/ValueErroron invalid entries in the supplied set.This allows
mypy --strict greenery/charclass{_test}.pyto pass.