Additional cleanup for python 3.9 #6758
Merged
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
- Migrate away from deprecated typing collections for collections.abc - fix missed PEP 585 typing hints - cleanup some __new__ functions' super() calls - remove pre-3.9 lru_cache usage - LintingRecord converted to a TypedDict class - simplified some comprehensions
Coverage Results ✅ |
alanmcruickshank
requested changes
Mar 29, 2025
src/sqlfluff/core/config/file.py
Outdated
Comment on lines
15
to
18
|
|
||
| # Explicitly rename so that mypy is happy re-exporting it for other | ||
| # modules to use. | ||
| from functools import cache as cache |
There was a problem hiding this comment.
Now that we're not doing the version check on python and then importing it differently, I don't think we should re-export cache here, we should just import it directly from functools in whichever modules are using it.
Comment on lines
+21
to
+29
| class LintingRecord(TypedDict): | ||
| """A class to store the linted file statistics.""" | ||
|
|
||
| filepath: str | ||
| violations: list[SerializedObject] | ||
| # Things like file length | ||
| statistics: dict[str, int] | ||
| # Raw timings, in seconds, for both rules and steps | ||
| timings: dict[str, float] |
alanmcruickshank
approved these changes
Mar 30, 2025
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.
Brief summary of the change made
I found some additional opportunities with dropping python 3.8 and updating things that would likely need to be touched in October 2025.
typingcollections forcollections.abc__new__functionsuper()callsfunctools.lru_cacheusageLintingRecordconverted to aTypedDictclassAre there any other side effects of this change that we should be aware of?
None, this should functionally be the same.
Pull Request checklist
Please confirm you have completed any of the necessary steps below.
Included test cases to demonstrate any code changes, which may be one or more of the following:
.ymlrule test cases intest/fixtures/rules/std_rule_cases..sql/.ymlparser test cases intest/fixtures/dialects(note YML files can be auto generated withtox -e generate-fixture-yml).test/fixtures/linter/autofix.Added appropriate documentation for the change.
Created GitHub issues for any relevant followup/future enhancements if appropriate.