Sourcery refactored master branch#1
Open
sourcery-ai[bot] wants to merge 1 commit into
Open
Conversation
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| for x in tree['contents']: | ||
| for y in flatten_tree(x): | ||
| yield y | ||
| yield from flatten_tree(x) |
Author
There was a problem hiding this comment.
Function flatten_tree refactored with the following changes:
- Replace yield inside for loop with yield from (
yield-from)
Comment on lines
-42
to
+44
| if 'contents' in tree: | ||
| x = tree['contents'][0] | ||
| return first_leaf(x) | ||
| else: | ||
| if 'contents' not in tree: | ||
| return tree | ||
| x = tree['contents'][0] | ||
| return first_leaf(x) |
Author
There was a problem hiding this comment.
Function first_leaf 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
-49
to
+47
| if page is None: | ||
| uri = f'/books/{book}' | ||
| else: | ||
| uri = f'/books/{book}/pages/{page}' | ||
| return uri | ||
| return f'/books/{book}' if page is None else f'/books/{book}/pages/{page}' |
Author
There was a problem hiding this comment.
Function rex_uri refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-57
to
+55
| if page is None: | ||
| uri_regex = f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$" | ||
| else: | ||
| uri_regex = f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?:({page['id']}|{page['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$" | ||
| return uri_regex | ||
| return ( | ||
| f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$" | ||
| if page is None | ||
| else f"/contents/({book['id']}|{book['short_id']})(@[.\d]+)?:({page['id']}|{page['short_id']})(@[.\d]+)?(/[-%\w\d]+)?$" | ||
| ) |
Author
There was a problem hiding this comment.
Function cnx_uri_regex refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
| class CalledProcessError(Exception): | ||
| pass | ||
| if not res == 0: | ||
| if res != 0: |
Author
There was a problem hiding this comment.
Function _check_call_py24 refactored with the following changes:
- Simplify logical expression using De Morgan identities (
de-morgan)
Comment on lines
-186
to
+188
| try: | ||
| subprocess.check_call(cmd, stdout=devnull, stderr=devnull) | ||
| except: | ||
| return False | ||
| subprocess.check_call(cmd, stdout=devnull, stderr=devnull) | ||
| except: | ||
| return False |
Author
There was a problem hiding this comment.
Function has_powershell refactored with the following changes:
- Merge nested try-statement into a single try (
flatten-nested-try)
Comment on lines
-204
to
+205
| try: | ||
| subprocess.check_call(cmd, stdout=devnull, stderr=devnull) | ||
| except: | ||
| return False | ||
| subprocess.check_call(cmd, stdout=devnull, stderr=devnull) | ||
| except: | ||
| return False |
Author
There was a problem hiding this comment.
Function has_curl refactored with the following changes:
- Merge nested try-statement into a single try (
flatten-nested-try)
| return False | ||
| subprocess.check_call(cmd, stdout=devnull, stderr=devnull) | ||
| except: | ||
| return False |
Author
There was a problem hiding this comment.
Function has_wget refactored with the following changes:
- Merge nested try-statement into a single try (
flatten-nested-try)
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
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
masterrefactored 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
masterbranch, then run:Help us improve this pull request!