ruff prep #5764
Closed
ruff prep #5764
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
Signed-off-by: Flynn <[email protected]>
dosubot
bot
added
size:L
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: Flynn <[email protected]>
kflynn
force-pushed
the
flynn/dev/ruff-prep
branch
from
60bf309
to
d7858b5
Compare
the-wondersmith
requested changes
Aug 10, 2024
| @@ -241,7 +241,7 @@ def good_ambassador_id(self, resource: dict): | |||
| # Make sure it's a list. Yes, this is Draconian, | |||
| # but the jsonschema will allow only a string or a list, | |||
| # and guess what? Strings are Iterables. | |||
| if type(allowed_ids) != list: | |||
| if type(allowed_ids) is not list: | |||
There was a problem hiding this comment.
Suggested change
| if type(allowed_ids) is not list: | |
| if not isinstance(allowed_ids, list): |
| @@ -31,6 +31,10 @@ class _CompileResult(TypedDict): | |||
| xds: NotRequired[EnvoyConfig] | |||
|
|
|||
|
|
|||
| def null_file_checker(path: str) -> bool: | |||
There was a problem hiding this comment.
Suggested change
| def null_file_checker(path: str) -> bool: | |
| def null_file_checker(_: str) -> bool: |
Tiny nit - unused variables shouldn't be bound to names
| @@ -430,7 +430,7 @@ def process(self, resource: ACResource) -> RichStatus: | |||
|
|
|||
| try: | |||
| handler(resource) | |||
| except Exception as e: | |||
| except Exception: | |||
There was a problem hiding this comment.
If nothing is being done here, why is the exception being caught? Usually, you'd expect something like:
try:
handler(resource)
except Exception as error:
raise SomeCustomError from errorSo that the traceback and context are preserved.
Haven't had time to dive into the full context here so it's a genuine question, not a criticism or anything 😅
| @@ -24,7 +24,7 @@ def __init__(self, config: "V3Config") -> None: | |||
|
|
|||
| self.update( | |||
| { | |||
| "listeners": [l.as_dict() for l in config.listeners], | |||
| "listeners": [x.as_dict() for x in config.listeners], | |||
There was a problem hiding this comment.
Suggested change
| "listeners": [x.as_dict() for x in config.listeners], | |
| "listeners": [listener.as_dict() for listener in config.listeners], |
Absolutely a tiny nit, please feel 100% free to ignore it, just a personal preference for short-but-descriptive variable names over generic or shortest-possible ones.
| @@ -406,13 +406,13 @@ def __init__( | |||
|
|
|||
| request_headers_to_remove = group.get("remove_request_headers", None) | |||
| if request_headers_to_remove: | |||
| if type(request_headers_to_remove) != list: | |||
| if type(request_headers_to_remove) is not list: | |||
There was a problem hiding this comment.
Suggested change
| if type(request_headers_to_remove) is not list: | |
| if not isinstance(request_headers_to_remove, list): |
| request_headers_to_remove = [request_headers_to_remove] | ||
| self["request_headers_to_remove"] = request_headers_to_remove | ||
|
|
||
| response_headers_to_remove = group.get("remove_response_headers", None) | ||
| if response_headers_to_remove: | ||
| if type(response_headers_to_remove) != list: | ||
| if type(response_headers_to_remove) is not list: |
There was a problem hiding this comment.
Suggested change
| if type(response_headers_to_remove) is not list: | |
| if not isinstance(response_headers_to_remove, list): |
| @@ -68,7 +68,7 @@ def _cors_normalize(value: Any) -> Any: | |||
| are returned unaltered. | |||
| """ | |||
|
|
|||
| if type(value) == list: | |||
| if type(value) is list: | |||
There was a problem hiding this comment.
Suggested change
| if type(value) is list: | |
| if isinstance(value, list): |
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.
I've been messing with uv and ruff (thanks, @the-wondersmith!) and wow, they are fast enough to legit be game-changers. This PR cleans up the Python code in line with what ruff wants.
Reviewers: going commit by commit will probably be simpler but it's not that big a deal.