Basic cleanups #3
Open
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
A quick flake8 run showed a good number of imports and variables that were unused. We also found some object attributes that were unused. Also took the opportunity to eliminate commented code. Importing `os` also pulls in `os.path`, so there's no need to import both. Removed that from several files.
We found some explicit `close()` calls when writing files in a `with` block, which is not necessary. Files are closed when exiting the block, either by normal execution or by exception. We also convert a few instances of file writes *not* using `with` blocks, to use the appropriate `with` syntax.
The `filepath` parameter was no longer used; it seems like the `xorrspath` has superseded it, but the first was never removed. It also allows us to eliminate an unused variable in the calling method.
Jinja's official method for including template-like strings within templates is to use variable blocks with quoted strings inside. We will eliminate the need for callers to provide something which the mock template can provide on its own.
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.
Most of this is just dead-code removal: unused variables, unused imports, redundant imports, and commented code.
This includes a commit which normalizes all file-writing to use
withblocks. Usingwithensures that the file will always be closed when the block ends, so there is no need to explicitly callclose()on the file handle - it will always be done for us.Some other small cleanups, which are detailed in their respective commit log messages.
I don't see a license on this codebase, but I authorize these changes to be incorporated with the parent repository, under whatever license is in use.