Sourcery refactored ultroid branch #2
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}
Comment on lines
-169
to
+173
| for root, _dirs, _files in os.walk(LIBRARY_DIR, topdown=False): | ||
| # setuptools is including __pycache__ for some reason (#1605) | ||
| if root.endswith('/__pycache__'): | ||
| remove_dirs.append(root) | ||
| remove_dirs.extend( | ||
| root | ||
| for root, _dirs, _files in os.walk(LIBRARY_DIR, topdown=False) | ||
| if root.endswith('/__pycache__') | ||
| ) |
There was a problem hiding this comment.
Function main refactored with the following changes:
- Replace a for append loop with list extend (
for-append-to-extend) - Replace m.group(x) with m[x] for re.Match objects (
use-getitem-for-re-match-groups)
This removes the following comments ( why? ):
# setuptools is including __pycache__ for some reason (#1605)
Comment on lines
-77
to
+79
| version = re.search(r"^__version__\s+=\s+'(.*)'$", | ||
| f.read(), flags=re.MULTILINE).group(1) | ||
| version = re.search( | ||
| r"^__version__\s+=\s+'(.*)'$", f.read(), flags=re.MULTILINE | ||
| )[1] |
There was a problem hiding this comment.
Lines 77-78 refactored with the following changes:
- Replace m.group(x) with m[x] for re.Match objects (
use-getitem-for-re-match-groups)
Comment on lines
-25
to
+27
| node = nodes.reference(rawtext, utils.unescape(name), | ||
| refuri='{}?q={}'.format(base, name), | ||
| **options) | ||
| return node | ||
| return nodes.reference( | ||
| rawtext, utils.unescape(name), refuri=f'{base}?q={name}', **options | ||
| ) |
There was a problem hiding this comment.
Function make_link_node refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable) - Replace call to format with f-string (
use-fstring-for-formatting)
| result = self.__dict__.get(utils.get_peer_id(cls(item))) | ||
| if result: | ||
| if result := self.__dict__.get(utils.get_peer_id(cls(item))): |
There was a problem hiding this comment.
Function EntityCache.__getitem__ refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
| parent = os.path.dirname(file_path) | ||
| if parent: | ||
| if parent := os.path.dirname(file_path): |
There was a problem hiding this comment.
Function ensure_parent_dir_exists refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
Comment on lines
-97
to
+102
| if diff < 0 or \ | ||
| diff.bit_length() < min_diff_bits_count or \ | ||
| modexp.bit_length() < min_diff_bits_count or \ | ||
| (modexp.bit_length() + 7) // 8 > max_mod_exp_size: | ||
| return False | ||
| return True | ||
| return ( | ||
| diff >= 0 | ||
| and diff.bit_length() >= min_diff_bits_count | ||
| and modexp.bit_length() >= min_diff_bits_count | ||
| and (modexp.bit_length() + 7) // 8 <= max_mod_exp_size | ||
| ) |
There was a problem hiding this comment.
Function is_good_mod_exp_first 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) - Simplify boolean if expression (
boolean-if-exp-identity) - Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
| if loop.is_running(): | ||
| return coro | ||
| else: | ||
| return loop.run_until_complete(coro) | ||
| return coro if loop.is_running() else loop.run_until_complete(coro) |
There was a problem hiding this comment.
Function _syncify_wrap refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
| if not name.startswith('_') or name == '__call__': | ||
| if inspect.iscoroutinefunction(getattr(t, name)): | ||
| _syncify_wrap(t, name) | ||
| if ( | ||
| not name.startswith('_') or name == '__call__' | ||
| ) and inspect.iscoroutinefunction(getattr(t, name)): | ||
| _syncify_wrap(t, name) |
There was a problem hiding this comment.
Function syncify refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
| return '{} {}'.format(entity.first_name, entity.last_name) | ||
| return f'{entity.first_name} {entity.last_name}' |
There was a problem hiding this comment.
Function get_display_name refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-138
to
+140
| raise TypeError('Cannot cast {} to any kind of {}.'.format( | ||
| type(entity).__name__, target)) | ||
| raise TypeError( | ||
| f'Cannot cast {type(entity).__name__} to any kind of {target}.' | ||
| ) |
There was a problem hiding this comment.
Function _raise_cast_fail refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
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
ultroidrefactored 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
ultroidbranch, then run:Help us improve this pull request!