Sourcery refactored master branch #1
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
-38
to
+58
| patterns = [ r'\b{}\b'.format(x) for x in | ||
| ('exception', 'error', 'warning', 'fatal', 'traceback', | ||
| 'fault', 'crash(?:ed)?', 'abort(?:ed)', | ||
| 'uninitiali[zs]ed') ] | ||
| patterns = [ | ||
| f'\b{x}\b' | ||
| for x in ( | ||
| 'exception', | ||
| 'error', | ||
| 'warning', | ||
| 'fatal', | ||
| 'traceback', | ||
| 'fault', | ||
| 'crash(?:ed)?', | ||
| 'abort(?:ed)', | ||
| 'uninitiali[zs]ed', | ||
| ) | ||
| ] | ||
| patterns += ['^==[0-9]+== '] | ||
| for pattern in patterns: | ||
| cp = re.compile(pattern, re.IGNORECASE | re.MULTILINE) | ||
| hit = cp.search(stderr) | ||
| if hit: | ||
| raise AssertionError('Suspicious output to stderr (matched "%s")' % hit.group(0)) | ||
| hit = cp.search(stdout) | ||
| if hit: | ||
| raise AssertionError('Suspicious output to stdout (matched "%s")' % hit.group(0)) | ||
| if hit := cp.search(stderr): | ||
| raise AssertionError(f'Suspicious output to stderr (matched "{hit[0]}")') | ||
| if hit := cp.search(stdout): | ||
| raise AssertionError(f'Suspicious output to stdout (matched "{hit[0]}")') |
There was a problem hiding this comment.
Function check_test_output refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting) - Use named expression to simplify assignment and conditional [×2] (
use-named-expression) - Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring) - Replace m.group(x) with m[x] for re.Match objects [×2] (
use-getitem-for-re-match-groups)
Comment on lines
-62
to
+67
| cmdline = base_cmdline + [ pjoin(basename, 'sshfs'), | ||
| '-f', 'localhost:' + src_dir, mnt_dir ] | ||
| cmdline = base_cmdline + [ | ||
| pjoin(basename, 'sshfs'), | ||
| '-f', | ||
| f'localhost:{src_dir}', | ||
| mnt_dir, | ||
| ] |
There was a problem hiding this comment.
Function test_sshfs refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-136
to
+140
| fullname = mnt_dir + "/" + name | ||
| fullname = f"{mnt_dir}/{name}" |
There was a problem hiding this comment.
Function tst_unlink refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Comment on lines
-151
to
+155
| fullname = mnt_dir + "/" + dirname | ||
| fullname = f"{mnt_dir}/{dirname}" |
There was a problem hiding this comment.
Function tst_mkdir refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Comment on lines
-161
to
+165
| fullname = mnt_dir + "/" + name | ||
| fullname = f"{mnt_dir}/{name}" |
There was a problem hiding this comment.
Function tst_rmdir refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Comment on lines
-175
to
+179
| fullname = mnt_dir + "/" + linkname | ||
| fullname = f"{mnt_dir}/{linkname}" |
There was a problem hiding this comment.
Function tst_symlink refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Comment on lines
-323
to
+329
| file_ = src_newdir + "/" + name_generator() | ||
| subdir = src_newdir + "/" + name_generator() | ||
| subfile = subdir + "/" + name_generator() | ||
| file_ = f"{src_newdir}/{name_generator()}" | ||
| subdir = f"{src_newdir}/{name_generator()}" | ||
| subfile = f"{subdir}/{name_generator()}" |
There was a problem hiding this comment.
Function tst_readdir refactored with the following changes:
- Use f-string instead of string concatenation [×6] (
use-fstring-for-concatenation)
| pytest.fail('file system process terminated with code %s' % (code,)) | ||
| pytest.fail(f'file system process terminated with code {code}') |
There was a problem hiding this comment.
Function umount refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| return skip('Unable to open /dev/fuse: %s' % exc.strerror) | ||
| return skip(f'Unable to open /dev/fuse: {exc.strerror}') |
There was a problem hiding this comment.
Function fuse_test_marker refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
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!