Sourcery Starbot ⭐ refactored agusdmb/typeshed#1
Open
SourceryAI wants to merge 1 commit intoagusdmb:masterfrom
Open
Sourcery Starbot ⭐ refactored agusdmb/typeshed#1SourceryAI wants to merge 1 commit intoagusdmb:masterfrom
SourceryAI wants to merge 1 commit intoagusdmb:masterfrom
Conversation
SourceryAI
commented
Apr 25, 2022
| if not m: | ||
| return None | ||
| return m.group(1), m.group(2) | ||
| return m[1], m[2] |
Author
There was a problem hiding this comment.
Function search_pip_freeze_output refactored with the following changes:
- Replace m.group(x) with m[x] for re.Match objects (
use-getitem-for-re-match-groups)
| shutil.copytree(src_dir, os.path.join(stub_dir, package)) | ||
| else: | ||
| src_file = os.path.join("out", package + ".pyi") | ||
| src_file = os.path.join("out", f"{package}.pyi") |
Author
There was a problem hiding this comment.
Function copy_stubs refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| sys.exit(f"Error: Cannot parse version number: {version}") | ||
| fnam = os.path.join(stub_dir, "METADATA.toml") | ||
| version = m.group(0) | ||
| version = m[0] |
Author
There was a problem hiding this comment.
Function create_metadata refactored with the following changes:
- Replace m.group(x) with m[x] for re.Match objects (
use-getitem-for-re-match-groups)
| else: | ||
| if entry == "@python2": | ||
| continue | ||
| elif entry != "@python2": |
Author
There was a problem hiding this comment.
Function check_stdlib refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Lift code into else after jump in control flow (
reintroduce-else) - Remove redundant continue statement (
remove-redundant-continue)
Comment on lines
-73
to
+71
| else: | ||
| if entry in ("@python2", "@tests"): | ||
| continue | ||
| elif entry not in ("@python2", "@tests"): |
Author
There was a problem hiding this comment.
Function check_stubs refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Lift code into else after jump in control flow (
reintroduce-else) - Remove redundant continue statement (
remove-redundant-continue)
Comment on lines
-114
to
+116
| raise SystemExit("Cannot find typeshed subdir at {} (specify parent dir via --typeshed-location)".format(p)) | ||
| raise SystemExit( | ||
| f"Cannot find typeshed subdir at {p} (specify parent dir via --typeshed-location)" | ||
| ) |
Author
There was a problem hiding this comment.
Function check_subdirs_discoverable refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-152
to
+162
| run_pytype(filename=f, python_version=python_version, typeshed_location=typeshed_location) if not dry_run else None | ||
| None | ||
| if dry_run | ||
| else run_pytype( | ||
| filename=f, | ||
| python_version=python_version, | ||
| typeshed_location=typeshed_location, | ||
| ) | ||
| ) | ||
|
|
Author
There was a problem hiding this comment.
Function run_all_tests refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-17
to
+20
| version_allowlist = "py{}{}.txt".format(sys.version_info.major, sys.version_info.minor) | ||
| platform_allowlist = "{}.txt".format(sys.platform) | ||
| combined_allowlist = "{}-py{}{}.txt".format(sys.platform, sys.version_info.major, sys.version_info.minor) | ||
| version_allowlist = f"py{sys.version_info.major}{sys.version_info.minor}.txt" | ||
| platform_allowlist = f"{sys.platform}.txt" | ||
| combined_allowlist = f"{sys.platform}-py{sys.version_info.major}{sys.version_info.minor}.txt" | ||
|
|
Author
There was a problem hiding this comment.
Function run_stubtest refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
| with_filenames.extend(unused_files(uu)) | ||
| for file, uu in with_filenames: | ||
| print(file + ":" + uu) | ||
| print(f"{file}:{uu}") |
Author
There was a problem hiding this comment.
Function main refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-29
to
+43
| version = "py{}{}".format(sys.version_info[0], sys.version_info[1]) | ||
| files = ["py3_common.txt", version + ".txt", sys.platform + ".txt", sys.platform + "-" + version + ".txt"] | ||
| version = f"py{sys.version_info[0]}{sys.version_info[1]}" | ||
| files = [ | ||
| "py3_common.txt", | ||
| f"{version}.txt", | ||
| f"{sys.platform}.txt", | ||
| f"{sys.platform}-{version}.txt", | ||
| ] | ||
|
|
||
| found = [] | ||
| for file in files: | ||
| path = _ALLOWLIST_PATH / file | ||
| if find_unused_in_file(unused, path): | ||
| found.append((path.as_posix(), unused)) | ||
| if not found: | ||
| raise ValueError("unused item {} not found in any allowlist file".format(unused)) | ||
| raise ValueError(f"unused item {unused} not found in any allowlist file") |
Author
There was a problem hiding this comment.
Function unused_files refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
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
1 participant
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.
Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨
Here's your pull request refactoring your most popular Python repo.
If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: