script_defs: Remove None assertion #1244
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
grahamc
approved these changes
Mar 6, 2020
There was a problem hiding this comment.
I was going to write some feedback about being more explicit, like adding types to r and d, but mypy is smart enough already!
[nix-shell:~/projects/github.com/NixOS/nixops]$ git diff
diff --git a/nixops/script_defs.py b/nixops/script_defs.py
index b0c283a..adb5e81 100644
--- a/nixops/script_defs.py
+++ b/nixops/script_defs.py
@@ -234,8 +234,8 @@ def op_info(args):
)
for name in names:
- d = definitions.get(name)
- r = depl.resources.get(name)
+ d: str = definitions.get(name)
+ r: str = depl.resources.get(name)
assert r is not None
if deployment.is_machine(r):
resource_state = "{0} / {1}".format(
[nix-shell:~/projects/github.com/NixOS/nixops]$ mypy nixops
nixops/script_defs.py:237: error: Incompatible types in assignment (expression has type "Optional[ResourceDefinition]", variable has type "str")
nixops/script_defs.py:238: error: Incompatible types in assignment (expression has type "Optional[ResourceState]", variable has type "str")
I was looking at the mypy html report, and if you'd like to help "clean up the campground" a bit, there is a trivial additional thing you could do:
adding -> str to resources/init.py's show_type()
and also adding types to def state(depl, d, m): in script_defs.py.
`r` being `None` is peferctly valid when the resource does not yet exist. Without this fix a resource not yet deployed fails with AssertionError.
adisbladis
force-pushed
the
assert-none-script-defs
branch
from
dc6ba23
to
c905ca8
Compare
|
@grahamc Updated PR with more typing. |
grahamc
reviewed
Mar 9, 2020
adisbladis
force-pushed
the
assert-none-script-defs
branch
from
ce8daeb
to
2b7cc8a
Compare
|
resources: 45.58% imprecise ->41.50% imprecise |
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.
rbeingNoneis peferctly valid when the resource does not yet exist.Without this fix a resource not yet deployed fails with AssertionError.