typings: Fixes and improvements for dbcore.query #4847
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
unintentionally, the pattern normalization added in 1c3a053 was a no-op, and only value normalization was actually applied (since self.pattern was left unchanged) This also helps with typing by ensuring that variables have fixed types
sampsyo
approved these changes
Jul 18, 2023
| except re.error as exc: | ||
| # Invalid regular expression. | ||
| raise InvalidQueryArgumentValueError(pattern, | ||
| "a regular expression", | ||
| format(exc)) | ||
|
|
||
| def col_clause(self): | ||
| super().__init__(field, pattern_re, fast) |
There was a problem hiding this comment.
[non-actionable] The diff confused me for a sec here, so for future reviewers: here's where the super call moved to.
| else: | ||
| raise ValueError("pattern must be bytes, str, or memoryview") | ||
|
|
||
| super().__init__(field, bytes_pattern) |
There was a problem hiding this comment.
Another solid improvement to the old version, where the mutation was admittedly hard to follow.
There was a problem hiding this comment.
That's really just pleasing mypy, which does not like shadowing of variables at all.
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.
The next iteration of introducing typings into dbcore. This is splitting out only
dbcore.query; with some additional changes, I have clean mypy ondbcore, but that'd be a bit too much for a single PR.