Sourcery refactored main branch #110
Open
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}
| account = Account.objects.get(id=account_id) | ||
| return account | ||
| return Account.objects.get(id=account_id) |
There was a problem hiding this comment.
Function get_one refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-51
to
+52
| result = [] | ||
| for a in accounts: | ||
| result.append({ | ||
| 'account': a.name, 'balance': list(a.balance()) | ||
| }) | ||
|
|
||
| result = [ | ||
| {'account': a.name, 'balance': list(a.balance())} for a in accounts | ||
| ] |
There was a problem hiding this comment.
Function get_account_balances refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension)
| case_insensitive_username_field = '{}__iexact'.format(self.model.USERNAME_FIELD) | ||
| case_insensitive_username_field = f'{self.model.USERNAME_FIELD}__iexact' |
There was a problem hiding this comment.
Function EmailAccountManager.get_by_natural_key refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _FinalForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _LiteralForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-1437
to
+1438
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _TypeGuardForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-1614
to
+1615
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _ExtensionsSpecialForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-1656
to
+1657
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _RequiredForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-1701
to
+1702
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _UnpackSpecialForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-1730
to
+1731
| return 'typing_extensions.' + self._name | ||
| return f'typing_extensions.{self._name}' |
There was a problem hiding this comment.
Function _UnpackForm.__repr__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-1832
to
+1833
| def __init_subclass__(self, *args, **kwds): | ||
| def __init_subclass__(cls, *args, **kwds): |
There was a problem hiding this comment.
Function TypeVarTuple.__init_subclass__ refactored with the following changes:
- The first argument to class methods should be
cls(class-method-first-arg-name)
Comment on lines
-2041
to
+2042
| raise AttributeError("Cannot overwrite NamedTuple attribute " + key) | ||
| raise AttributeError(f"Cannot overwrite NamedTuple attribute {key}") |
There was a problem hiding this comment.
Function _NamedTupleMeta.__new__ refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-18
to
+21
| if hasattr(application, "__call__"): | ||
| # We only check to see if its __call__ is a coroutine function - | ||
| # if it's not, it still might be a coroutine function itself. | ||
| if asyncio.iscoroutinefunction(application.__call__): | ||
| return False | ||
| if hasattr(application, "__call__") and asyncio.iscoroutinefunction( | ||
| application.__call__ | ||
| ): | ||
| return False |
There was a problem hiding this comment.
Function is_double_callable refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
This removes the following comments ( why? ):
# if it's not, it still might be a coroutine function itself.
# We only check to see if its __call__ is a coroutine function -
| self._attr_name = "_asgiref_local_impl_{}_{}".format( | ||
| id(self), | ||
| "".join(random.choice(string.ascii_letters) for i in range(8)), | ||
| ) | ||
| self._attr_name = f'_asgiref_local_impl_{id(self)}_{"".join(random.choice(string.ascii_letters) for _ in range(8))}' |
There was a problem hiding this comment.
Function Local.__init__ refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting) - Replace unused for index with underscore (
for-index-underscore)
| exception = details["future"].exception() | ||
| if exception: | ||
| if exception := details["future"].exception(): |
There was a problem hiding this comment.
Function StatelessServer.application_checker refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
Comment on lines
-303
to
+296
| models_module_name = "%s.%s" % (self.name, MODELS_MODULE_NAME) | ||
| models_module_name = f"{self.name}.{MODELS_MODULE_NAME}" |
There was a problem hiding this comment.
Function AppConfig.import_models refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-88
to
+91
| if isinstance(entry, AppConfig): | ||
| app_config = entry | ||
| else: | ||
| app_config = AppConfig.create(entry) | ||
| app_config = entry if isinstance(entry, AppConfig) else AppConfig.create(entry) | ||
| if app_config.label in self.app_configs: | ||
| raise ImproperlyConfigured( | ||
| "Application labels aren't unique, " | ||
| "duplicates: %s" % app_config.label | ||
| f"Application labels aren't unique, duplicates: {app_config.label}" |
There was a problem hiding this comment.
Function Apps.populate refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace if statement with if expression (
assign-if-exp) - Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring)
Comment on lines
-160
to
+159
| message = "No installed app with label '%s'." % app_label | ||
| message = f"No installed app with label '{app_label}'." | ||
| for app_config in self.get_app_configs(): | ||
| if app_config.name == app_label: | ||
| message += " Did you mean '%s'?" % app_config.label | ||
| message += f" Did you mean '{app_config.label}'?" |
There was a problem hiding this comment.
Function Apps.get_app_config refactored with the following changes:
- Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring)
Comment on lines
-216
to
+226
| # Since this method is called when models are imported, it cannot | ||
| # perform imports because of the risk of import loops. It mustn't | ||
| # call get_app_config(). | ||
| model_name = model._meta.model_name | ||
| app_models = self.all_models[app_label] | ||
| model_name = model._meta.model_name | ||
| if model_name in app_models: | ||
| if ( | ||
| model.__name__ == app_models[model_name].__name__ | ||
| and model.__module__ == app_models[model_name].__module__ | ||
| ): | ||
| warnings.warn( | ||
| "Model '%s.%s' was already registered. Reloading models is not " | ||
| "advised as it can lead to inconsistencies, most notably with " | ||
| "related models." % (app_label, model_name), | ||
| f"Model '{app_label}.{model_name}' was already registered. Reloading models is not advised as it can lead to inconsistencies, most notably with related models.", | ||
| RuntimeWarning, | ||
| stacklevel=2, | ||
| ) | ||
| else: | ||
| raise RuntimeError( | ||
| "Conflicting '%s' models in application '%s': %s and %s." | ||
| % (model_name, app_label, app_models[model_name], model) | ||
| f"Conflicting '{model_name}' models in application '{app_label}': {app_models[model_name]} and {model}." |
There was a problem hiding this comment.
Function Apps.register_model refactored with the following changes:
- Move assignment closer to its usage within a block (
move-assign-in-block) - Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring)
This removes the following comments ( why? ):
# Since this method is called when models are imported, it cannot
# perform imports because of the risk of import loops. It mustn't
# call get_app_config().
Comment on lines
-280
to
+270
| raise LookupError("Model '%s.%s' not registered." % (app_label, model_name)) | ||
| raise LookupError(f"Model '{app_label}.{model_name}' not registered.") |
There was a problem hiding this comment.
Function Apps.get_registered_model refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Sourcery Code Quality Report❌ Merging this PR will decrease code quality in the affected files by 0.16%.
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
mainrefactored 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
mainbranch, then run:Help us improve this pull request!