Sourcery refactored main branch #1
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
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| if hasattr(file, "isatty"): | ||
| return file.isatty() | ||
| return False | ||
| return file.isatty() if hasattr(file, "isatty") else False |
There was a problem hiding this comment.
Function isatty refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-136
to
-141
| try: | ||
| with contextlib.suppress(UnicodeError): | ||
| fileobj.write(s) | ||
| return | ||
| except UnicodeError: | ||
| pass | ||
|
|
There was a problem hiding this comment.
Function _write_with_fallback refactored with the following changes:
- Use
contextlib'ssuppressmethod to silence an error (use-contextlib-suppress)
Comment on lines
-195
to
+200
| if i + 1 == len(args): | ||
| color = "" | ||
| else: | ||
| color = args[i + 1] | ||
|
|
||
| color = "" if i + 1 == len(args) else args[i + 1] | ||
| if color: | ||
| msg = _color_text(msg, color) | ||
| _write_with_fallback(msg, file) | ||
|
|
||
| _write_with_fallback(end, file) | ||
| else: | ||
| for i in range(0, len(args), 2): | ||
| msg = args[i] | ||
| _write_with_fallback(msg, file) | ||
| _write_with_fallback(end, file) | ||
|
|
||
| _write_with_fallback(end, file) |
There was a problem hiding this comment.
Function color_print refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Hoist repeated code outside conditional statement (
hoist-statement-from-if)
Comment on lines
-241
to
+232
| if x.strip() == "": | ||
| return default | ||
| return x | ||
| return default if x.strip() == "" else x |
There was a problem hiding this comment.
Function get_answer_default refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-247
to
+236
| if len(s) > l: | ||
| return "..." + s[-(l - 3) :] | ||
| else: | ||
| return s | ||
| return f"...{s[-(l - 3):]}" if len(s) > l else s |
There was a problem hiding this comment.
Function truncate_left refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-165
to
+163
| else: | ||
| str_err = human_float(err / units[i][1], 1, truncate_small=2) | ||
| return f"{str_time:s}±{str_err:s}{units[i][0]}" | ||
| str_err = human_float(err / units[i][1], 1, truncate_small=2) | ||
| return f"{str_time:s}±{str_err:s}{units[i][0]}" |
There was a problem hiding this comment.
Function human_time refactored with the following changes:
- Remove unnecessary else after guard condition (
remove-unnecessary-else)
| @@ -32,6 +32,7 @@ | |||
| adding a new submodule with an "export_as_benchmark" attribute. | |||
| """ | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Lines 50-51 refactored with the following changes:
- Replace a for append loop with list extend (
for-append-to-extend) - Simplify generator expression (
simplify-generator)
Comment on lines
-34
to
+45
| if ignore_case: | ||
| attrs = [ | ||
| getattr(source, key) for key in dir(source) if key.lower() == name.lower() | ||
| ] | ||
|
|
||
| if len(attrs) > 1: | ||
| raise ValueError(f"{source.__name__} contains multiple {name} functions.") | ||
| elif len(attrs) == 1: | ||
| return attrs[0] | ||
| else: | ||
| return None | ||
| else: | ||
| if not ignore_case: | ||
| return getattr(source, name, None) | ||
| attrs = [ | ||
| getattr(source, key) for key in dir(source) if key.lower() == name.lower() | ||
| ] | ||
|
|
||
| if len(attrs) > 1: | ||
| raise ValueError(f"{source.__name__} contains multiple {name} functions.") | ||
| elif len(attrs) == 1: | ||
| return attrs[0] | ||
| else: | ||
| return None |
There was a problem hiding this comment.
Function _get_attr refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-276
to
+281
| if info.defaults is not None: | ||
| min_args = max_args - len(info.defaults) | ||
| else: | ||
| min_args = max_args | ||
|
|
||
| min_args = max_args if info.defaults is None else max_args - len(info.defaults) | ||
| if info.varargs is not None: | ||
| max_args = math.inf | ||
|
|
||
| ok = (min_args <= max_num_args) and (min_num_args <= max_args) | ||
| if not ok: | ||
| if min_args == max_args: | ||
| args_str = min_args | ||
| else: | ||
| args_str = f"{min_args}-{max_args}" | ||
| args_str = min_args if min_args == max_args else f"{min_args}-{max_args}" |
There was a problem hiding this comment.
Function check_num_args refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Replace if statement with if expression [×2] (
assign-if-exp)
Comment on lines
-335
to
+334
| match = address_regex.match(result) | ||
| if match: | ||
| suspected_address = match.group(2) | ||
| if match := address_regex.match(result): | ||
| suspected_address = match[2] | ||
| # Double check this is the actual address | ||
| default_result = object.__repr__(obj) | ||
| match2 = address_regex.match(default_result) | ||
| if match2: | ||
| known_address = match2.group(2) | ||
| if match2 := address_regex.match(default_result): | ||
| known_address = match2[2] | ||
| if known_address == suspected_address: | ||
| result = match.group(1) + match.group(3) | ||
| result = match[1] + match[3] |
There was a problem hiding this comment.
Function _repr_no_address refactored with the following changes:
- Use named expression to simplify assignment and conditional [×2] (
use-named-expression) - Replace m.group(x) with m[x] for re.Match objects [×4] (
use-getitem-for-re-match-groups)
Comment on lines
-467
to
+457
| self._params = [[item for item in entry] for entry in self._params] | ||
| self._params = [list(entry) for entry in self._params] |
There was a problem hiding this comment.
Function Benchmark.__init__ refactored with the following changes:
- Replace identity comprehension with call to collection constructor (
identity-comprehension) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-564
to
+573
| root, self.name + ": setup_cache", self._setup_cache, 0 | ||
| root, f"{self.name}: setup_cache", self._setup_cache, 0 | ||
| ) | ||
| max_num_args += 1 | ||
|
|
||
| for setup in self._setups: | ||
| ok = ok and check_num_args( | ||
| root, self.name + ": setup", setup, min_num_args, max_num_args | ||
| root, f"{self.name}: setup", setup, min_num_args, max_num_args | ||
| ) | ||
|
|
||
| ok = ok and check_num_args( | ||
| root, self.name + ": call", self.func, min_num_args, max_num_args | ||
| root, f"{self.name}: call", self.func, min_num_args, max_num_args | ||
| ) | ||
|
|
||
| for teardown in self._teardowns: | ||
| ok = ok and check_num_args( | ||
| root, self.name + ": teardown", teardown, min_num_args, max_num_args | ||
| root, | ||
| f"{self.name}: teardown", | ||
| teardown, | ||
| min_num_args, | ||
| max_num_args, |
There was a problem hiding this comment.
Function Benchmark.check refactored with the following changes:
- Use f-string instead of string concatenation [×4] (
use-fstring-for-concatenation)
HaoZeke
added a commit
that referenced
this pull request
Jul 8, 2023
MAINT: 'Refactored by Sourcery' (#1)
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.
Branch
mainrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
mainbranch, then run:Help us improve this pull request!