Sourcery refactored master branch #1
Conversation
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
|
Hey! Changelogs info seems to be missing or might be in incorrect format. |
|
Authentication to CNP for DevOps failed. Click here to try again: https://portal.cwp.radwarecloud.com/github-plugin.html?installation_id=26169338&setup_action=install |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| any_prefix_is_slash[:] = [True] | ||
| if not param.is_flag and not param.count: | ||
| rv += " " + param.make_metavar() | ||
| rv += f" {param.make_metavar()}" |
Author
There was a problem hiding this comment.
Function get_opts._write refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| def write_page(out, data): | ||
| path = data["path"] | ||
| filename = os.path.join(out, *path[1:]) + "/index.rst" | ||
| filename = f"{os.path.join(out, *path[1:])}/index.rst" |
Author
There was a problem hiding this comment.
Function write_page refactored with the following changes:
- Simplify generator expression (
simplify-generator) - Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring) - Merge append into list declaration [×4] (
merge-list-append) - Replace a for append loop with list extend [×2] (
for-append-to-extend) - Merge consecutive list appends into a single extend [×6] (
merge-list-appends-into-extend)
Comment on lines
-91
to
+110
| ", ".join("%s" % d for d in param.default) | ||
| ", ".join(f"{d}" for d in param.default) | ||
| if isinstance(param.default, (list, tuple)) | ||
| else (param.default,) | ||
| ) | ||
|
|
Author
There was a problem hiding this comment.
Function dump_command refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| if not item: | ||
| return False | ||
| return True | ||
| return bool(msg.string) if isinstance(msg.string, bytes) else all(msg.string) |
Author
There was a problem hiding this comment.
Function is_translated 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) - Use any() instead of for loop (
use-any) - Invert any/all to simplify comparisons (
invert-any-all) - Simplify generator expression (
simplify-generator)
| filename = "raven/base.py" | ||
| else: | ||
| filename = random.choice(loremipsum.words) + ".js" | ||
| filename = f"{random.choice(loremipsum.words)}.js" |
Author
There was a problem hiding this comment.
Function generate_commits refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| def pre_save(self, instance, add): | ||
| value = getattr(instance, self.attname) | ||
| return value | ||
| return getattr(instance, self.attname) |
Author
There was a problem hiding this comment.
Function BitField.pre_save refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| self._value = int(value) | ||
| else: | ||
| self._value = 0 | ||
| self._value = int(value) if value else 0 |
Author
There was a problem hiding this comment.
Function BitHandler.__init__ refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-118
to
+115
| if not isinstance(other, BitHandler): | ||
| return False | ||
| return self._value == other._value | ||
| return self._value == other._value if isinstance(other, BitHandler) else False |
Author
There was a problem hiding this comment.
Function BitHandler.__eq__ refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-138
to
+133
| return "<{}: {}>".format( | ||
| self.__class__.__name__, | ||
| ", ".join(f"{k}={self.get_bit(n).is_set}" for n, k in enumerate(self._keys)), | ||
| ) | ||
| return f'<{self.__class__.__name__}: {", ".join((f"{k}={self.get_bit(n).is_set}" for n, k in enumerate(self._keys)))}>' |
Author
There was a problem hiding this comment.
Function BitHandler.__repr__ refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-183
to
+175
| raise AttributeError("%s is not a valid flag" % key) | ||
| raise AttributeError(f"{key} is not a valid flag") |
Author
There was a problem hiding this comment.
Function BitHandler.__getattr__ refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-192
to
+184
| raise AttributeError("%s is not a valid flag" % key) | ||
| raise AttributeError(f"{key} is not a valid flag") |
Author
There was a problem hiding this comment.
Function BitHandler.__setattr__ refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| if __build__: | ||
| return f"{__version__}.{__build__}" | ||
| return __version__ | ||
| return f"{__version__}.{__build__}" if __build__ else __version__ |
Author
There was a problem hiding this comment.
Function get_version 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)
| return '<pre style="display:inline-block;white-space:pre-wrap;">{}</pre>'.format( | ||
| escape(saferepr(instance.value)) | ||
| ) | ||
| return f'<pre style="display:inline-block;white-space:pre-wrap;">{escape(saferepr(instance.value))}</pre>' |
Author
There was a problem hiding this comment.
Function OptionAdmin.value_repr refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-212
to
+210
| if not obj: | ||
| return self.add_fieldsets | ||
| return super().get_fieldsets(request, obj) | ||
| return super().get_fieldsets(request, obj) if obj else self.add_fieldsets |
Author
There was a problem hiding this comment.
Function UserAdmin.get_fieldsets refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-222
to
+223
| defaults.update( | ||
| {"form": self.add_form, "fields": admin.util.flatten_fieldsets(self.add_fieldsets)} | ||
| ) | ||
| defaults.update(kwargs) | ||
| defaults |= { | ||
| "form": self.add_form, | ||
| "fields": admin.util.flatten_fieldsets(self.add_fieldsets), | ||
| } | ||
|
|
||
| defaults |= kwargs |
Author
There was a problem hiding this comment.
Function UserAdmin.get_form refactored with the following changes:
- Merge dictionary updates via the union operator [×2] (
dict-assign-update-to-union)
Comment on lines
-208
to
+210
| missing_attachment_types = required_attachment_types - {ea.type for ea in attachments} | ||
|
|
||
| if missing_attachment_types: | ||
| if missing_attachment_types := required_attachment_types - { | ||
| ea.type for ea in attachments | ||
| }: |
Author
There was a problem hiding this comment.
Function pull_event_data refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
| new_sdk_version = self.new_sdk_version | ||
| if self.ignore_patch_version: | ||
| new_sdk_version = ".".join(v for v in new_sdk_version.split(".")[:2]) | ||
| new_sdk_version = ".".join(new_sdk_version.split(".")[:2]) |
Author
There was a problem hiding this comment.
Function UpdateSDKSuggestion.get_new_state refactored with the following changes:
- Simplify generator expression (
simplify-generator)
Comment on lines
-336
to
+340
| if not settings.SENTRY_RELEASE_REGISTRY_BASEURL: | ||
| return {} | ||
|
|
||
| return cache.get(SDK_INDEX_CACHE_KEY) or {} | ||
| return ( | ||
| cache.get(SDK_INDEX_CACHE_KEY) or {} | ||
| if settings.SENTRY_RELEASE_REGISTRY_BASEURL | ||
| else {} | ||
| ) |
Author
There was a problem hiding this comment.
Function get_sdk_index refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-355
to
+356
| rv.update((key, info["main_docs_url"]) for (key, info) in get_sdk_index().items()) | ||
| rv |= ((key, info["main_docs_url"]) for (key, info) in get_sdk_index().items()) |
Author
There was a problem hiding this comment.
Function get_sdk_urls refactored with the following changes:
- Merge dictionary updates via the union operator (
dict-assign-update-to-union)
Comment on lines
-36
to
-37
|
|
||
| pass |
Author
There was a problem hiding this comment.
Function Analytics.setup refactored with the following changes:
- Remove redundant pass statement (
remove-redundant-pass)
Comment on lines
-34
to
+38
| new_value = {} | ||
| for attr in self.attributes: | ||
| new_value[attr.name] = attr.extract(getattr(value, attr.name, None)) | ||
| new_value = { | ||
| attr.name: attr.extract(getattr(value, attr.name, None)) | ||
| for attr in self.attributes | ||
| } | ||
|
|
Author
There was a problem hiding this comment.
Function Map.extract refactored with the following changes:
- Convert for loop into dictionary comprehension (
dict-comprehension)
|
|
||
| if items: | ||
| raise ValueError("Unknown attributes: {}".format(", ".join(items.keys()))) | ||
| raise ValueError(f'Unknown attributes: {", ".join(items.keys())}') |
Author
There was a problem hiding this comment.
Function get_data refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
| base_url = f"{base_url}?{querystring}" | ||
| else: | ||
| base_url = base_url + "?" | ||
| base_url = f"{base_url}?" |
Author
There was a problem hiding this comment.
Function Endpoint.build_cursor_link refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| allowed_origins = request.auth.get_allowed_origins() | ||
| else: | ||
| allowed_origins = None | ||
| allowed_origins = request.auth.get_allowed_origins() if request.auth else None |
Author
There was a problem hiding this comment.
Function Endpoint.dispatch refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-420
to
+417
| if end: | ||
| end = to_datetime(float(end)) | ||
| else: | ||
| end = datetime.utcnow().replace(tzinfo=utc) | ||
| end = to_datetime(float(end)) if end else datetime.utcnow().replace(tzinfo=utc) |
Author
There was a problem hiding this comment.
Function StatsMixin._parse_args refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-68
to
+77
| elif ("-%s" % self.key) in queryset.query.order_by: | ||
| elif f"-{self.key}" in queryset.query.order_by: | ||
| if asc: | ||
| index = queryset.query.order_by.index(f"-{self.key}") | ||
| new_order_by = list(queryset.query.order_by) | ||
| new_order_by[index] = queryset.query.order_by[index][1:] | ||
| queryset.query.order_b = tuple(new_order_by) | ||
| elif asc: | ||
| queryset = queryset.order_by(self.key) | ||
| else: | ||
| if asc: | ||
| queryset = queryset.order_by(self.key) | ||
| else: | ||
| queryset = queryset.order_by("-%s" % self.key) | ||
| queryset = queryset.order_by(f"-{self.key}") |
Author
There was a problem hiding this comment.
Function BasePaginator.build_queryset refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring)
Comment on lines
-112
to
+111
| if cursor.value: | ||
| cursor_value = self.value_from_cursor(cursor) | ||
| else: | ||
| cursor_value = 0 | ||
|
|
||
| cursor_value = self.value_from_cursor(cursor) if cursor.value else 0 |
Author
There was a problem hiding this comment.
Function BasePaginator.get_result refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
| return math.floor(value) if self._is_asc(cursor.is_prev) else math.ceil(value) | ||
| if isinstance(value, str): | ||
| return unquote(value) | ||
| return value |
Author
There was a problem hiding this comment.
Function CombinedQuerysetPaginator.value_from_cursor refactored with the following changes:
- Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-650
to
+644
| sort_keys = [] | ||
| sort_keys.append(self.get_item_key(item, is_prev)) | ||
| sort_keys = [self.get_item_key(item, is_prev)] |
Author
There was a problem hiding this comment.
Function CombinedQuerysetPaginator._build_combined_querysets._sort_combined_querysets refactored with the following changes:
- Merge append into list declaration (
merge-list-append)
Comment on lines
-668
to
+661
| if cursor.value: | ||
| cursor_value = self.value_from_cursor(cursor) | ||
| else: | ||
| cursor_value = None | ||
|
|
||
| cursor_value = self.value_from_cursor(cursor) if cursor.value else None |
Author
There was a problem hiding this comment.
Function CombinedQuerysetPaginator.get_result refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Author
Sourcery Code Quality Report❌ Merging this PR will decrease code quality in the affected files by 0.07%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
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!