MNT: Apply assorted ruff/Pylint Refactor rules (PLR) #28755
Draft
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
Class method defined without decorator
Cannot have defined parameters for properties
Useless `return` statement at end of function
Consider merging multiple comparisons. Use a `set` if the elements are hashable.
Use `elif` instead of `else` then `if`, to reduce indentation
Use a set literal when testing for membership
b85d6e2 to
567df2e
Compare
jorenham
requested changes
Apr 17, 2025
| @@ -1426,7 +1426,7 @@ def normalize_axis_tuple(axis, ndim, argname=None, allow_duplicate=False): | |||
| normalize_axis_index : normalizing a single scalar axis | |||
| """ | |||
| # Optimization to speed-up the most common cases. | |||
| if type(axis) not in (tuple, list): | |||
| if type(axis) not in {tuple, list}: | |||
There was a problem hiding this comment.
same story as above
Suggested change
| if type(axis) not in {tuple, list}: | |
| if not isinstance(axis, tuple | list): |
| @@ -148,7 +148,7 @@ def _setfieldnames(self, names, titles): | |||
| attribute """ | |||
|
|
|||
| if names: | |||
| if type(names) in [list, tuple]: | |||
| if type(names) in {list, tuple}: | |||
There was a problem hiding this comment.
same story as above
Suggested change
| if type(names) in {list, tuple}: | |
| if isinstance(names, list | tuple): |
| raise AttributeError("Cannot set '%s' attribute" % attr) | ||
| fielddict = nt.void.__getattribute__(self, 'dtype').fields | ||
| res = fielddict.get(attr, None) | ||
| if res: | ||
| return self.setfield(val, *res[:2]) | ||
| elif getattr(self, attr, None): |
There was a problem hiding this comment.
some other ruff rule will complain about this later anyway, so might as well do
Suggested change
| elif getattr(self, attr, None): | |
| if getattr(self, attr, None): |
| @@ -586,7 +586,7 @@ def expand_dims(a, axis): | |||
| else: | |||
| a = asanyarray(a) | |||
|
|
|||
| if type(axis) not in (tuple, list): | |||
| if type(axis) not in {tuple, list}: | |||
There was a problem hiding this comment.
Suggested change
| if type(axis) not in {tuple, list}: | |
| if not isinstance(axis, tuple | list): |
| @@ -3929,7 +3929,7 @@ def test_quantile_identification_equation(self, weights, method, alpha): | |||
| w = rng.integers(low=0, high=10, size=n) if weights else None | |||
| x = np.quantile(y, alpha, method=method, weights=w) | |||
|
|
|||
| if method in ("higher",): | |||
| if method in {"higher",}: | |||
There was a problem hiding this comment.
Suggested change
| if method in {"higher",}: | |
| if method == "higher": |
| @@ -62,7 +62,7 @@ def get_complex_dtype(dtype): | |||
|
|
|||
| def get_rtol(dtype): | |||
| # Choose a safe rtol | |||
| if dtype in (single, csingle): | |||
| if dtype in {single, csingle}: | |||
There was a problem hiding this comment.
this won't work; it relies on the special behavior of dtype.__eq__
| member_name != "typing" and # 2024-12: type names don't match | ||
| "numpy._core" not in member.__name__ and # outside _core | ||
| member not in visited_modules # not visited yet | ||
| inspect.ismodule(member) and "numpy" in member.__name__ and not member_name.startswith("_") and member_name not in {"tests", "typing"} and "numpy._core" not in member.__name__ and member not in visited_modules # not visited yet |
Comment on lines
+530
to
+531
| lbnd = 0 if dt in {bool, np.bool} else np.iinfo(dt).min | ||
| ubnd = 2 if dt in {bool, np.bool} else np.iinfo(dt).max + 1 |
There was a problem hiding this comment.
this isn't quite the same:
>>> np.True_.dtype in (np.bool,)
True
>>> np.True_.dtype in {np.bool}
False|
oh sorry I didn't notice the draft status, so my review was a bit premature. |
Co-authored-by: Joren Hammudoglu <[email protected]>
Co-authored-by: Joren Hammudoglu <[email protected]>
|
needs a rebase |
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.
No description provided.