2-to-3: Start with types #1232
Merged
2-to-3: Start with types #1232
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 test assumes peculiar ordering guarantees which have changed from python2. This switches it to be the output from python3, but a proper fix would either to test equality only up to permutation, or to fix and guarantee an actual ordering.
grahamc
commented
Feb 28, 2020
Comment on lines
+173
to
+187
| def _definition_for_required( | ||
| self, name: str | ||
| ) -> nixops.resources.ResourceDefinition: | ||
| defn = self._definition_for(name) | ||
| if defn is None: | ||
| raise Exception("Bug: Deployment.definitions['{}'] is None.".format(name)) | ||
| return defn | ||
|
|
||
| def _machine_definition_for_required( | ||
| self, name: str | ||
| ) -> nixops.backends.MachineDefinition: | ||
| defn = self._definition_for_required(name) | ||
| if not isinstance(defn, nixops.backends.MachineDefinition): | ||
| raise Exception("Definition named '{}' is not a machine.".format(name)) | ||
| return defn |
There was a problem hiding this comment.
Under the old behavior:
- self.definitions was None, causing
self.definititions[name]to be an Exception -- no change - self.definitions was a Dict, causing
self.definititions[name]to be possibly None -- generally not causing an Exception, but instead propogating a None around - self.definitions was a Dict,
self.definititions[name]was something, but not a Machine -- instead a different kind of resource. I believe this would cause an exception.
In other words, the only case I'm somewhat unsure about is the None case.
|
Also: there are commits from the other PR that I'm going to bring over here. |
…s renamed to json
This reverts commit 766e5e8.
|
Now improved to: In particular, known_hosts 51.39% -> 11.43%, state 60% -> 22%! |
|
I found no issues with my usual workflow on this branch, using the |
|
I didn't run into any issues when running without plugins, trying out the following commands: |
AmineChikhaoui
approved these changes
Mar 2, 2020
An alternative implementation of #1238 from GitHub user doshitan which used Literal[...] as a sort of dependent type: + @overload + def run_command( + self, + command: Command, + flags: List[str] = ..., + timeout: Optional[int] = ..., + logged: bool = ..., + allow_ssh_args: bool = ..., + user: Optional[str] = ..., + *, + capture_stdout: Literal[False], + **kwargs: Any + ) -> int: + ... + + @overload + def run_command( + self, + command: Command, + flags: List[str] = ..., + timeout: Optional[int] = ..., + logged: bool = ..., + allow_ssh_args: bool = ..., + user: Optional[str] = ..., + *, + capture_stdout: Literal[True], + **kwargs: Any + ) -> str: + ... + + @overload + def run_command( + self, + command: Command, + flags: List[str] = [], + timeout: Optional[int] = None, + logged: bool = True, + allow_ssh_args: bool = False, + user: Optional[str] = None, + **kwargs: Any + ) -> Union[str, int]: + ... however, I think this option is much simpler and improves the API. Possibly in the future we will add this more complex type.
|
💕 💕 🌈 |
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.
A rethinking of #1227 which starts by adding types where there are problems. Adds types and corrects issues where
mypywas unhappy, after asking it to check untyped defs.(Don't merge.)