Sourcery refactored master branch #2
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
-92
to
+93
| for e in exclude: | ||
| if exclude[e] is not None: | ||
| for e, value in exclude.items(): | ||
| if value is not None: |
There was a problem hiding this comment.
Lines 92-93 refactored with the following changes:
- Use items() to directly unpack dictionary values (
use-dict-items)
Comment on lines
-31
to
+45
| if change and settings.ACCOUNTS_APPROVAL_REQUIRED: | ||
| if obj.is_active and not User.objects.get(id=obj.id).is_active: | ||
| if settings.ACCOUNTS_VERIFICATION_REQUIRED: | ||
| # Accounts verification requires an inactive account | ||
| obj.is_active = False | ||
| # The token generated by send_verification_mail() | ||
| # must match the _saved_ User object, | ||
| # so postpone send_verification_mail() until later | ||
| must_send_verification_mail_after_save = True | ||
| else: | ||
| send_approved_mail(request, obj) | ||
| if ( | ||
| change | ||
| and settings.ACCOUNTS_APPROVAL_REQUIRED | ||
| and obj.is_active | ||
| and not User.objects.get(id=obj.id).is_active | ||
| ): | ||
| if settings.ACCOUNTS_VERIFICATION_REQUIRED: | ||
| # Accounts verification requires an inactive account | ||
| obj.is_active = False | ||
| # The token generated by send_verification_mail() | ||
| # must match the _saved_ User object, | ||
| # so postpone send_verification_mail() until later | ||
| must_send_verification_mail_after_save = True | ||
| else: | ||
| send_approved_mail(request, obj) |
There was a problem hiding this comment.
Function UserProfileAdmin.save_model refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
| user_fields = set([f.name for f in User._meta.get_fields()]) | ||
| user_fields = {f.name for f in User._meta.get_fields()} |
There was a problem hiding this comment.
Function ProfileForm.__init__ refactored with the following changes:
- Replace unneeded comprehension with generator (
comprehension-to-generator) - Replace list(), dict() or set() with comprehension (
collection-builtin-to-comprehension)
Comment on lines
-58
to
+61
| for (name, items) in settings.ADMIN_MENU_ORDER: | ||
| if "blog.BlogCategory" in items: | ||
| return True | ||
| return False | ||
| return any( | ||
| "blog.BlogCategory" in items | ||
| for (name, items) in settings.ADMIN_MENU_ORDER | ||
| ) |
There was a problem hiding this comment.
Function BlogCategoryAdmin.has_module_permission refactored with the following changes:
- Use any() instead of for loop (
use-any)
Comment on lines
-52
to
+53
| post_dict = dict() | ||
| post_dict["title"] = post_element.find("blogml:title", | ||
| namespaces=ns).text | ||
| post_dict = {"title": post_element.find("blogml:title", | ||
| namespaces=ns).text} |
There was a problem hiding this comment.
Function Command.handle_import._process_post_element refactored with the following changes:
- Replace dict() with {} (
dict-literal) - Merge dictionary assignment with declaration (
merge-dict-assign) - Replace list(), dict() or set() with comprehension (
collection-builtin-to-comprehension)
| formfield = super(RichTextField, self).formfield(**kwargs) | ||
| return formfield | ||
| return super(RichTextField, self).formfield(**kwargs) |
There was a problem hiding this comment.
Function RichTextField.formfield refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| count = count / age**settings.SEARCH_AGE_SCALE_FACTOR | ||
| count /= age**settings.SEARCH_AGE_SCALE_FACTOR |
There was a problem hiding this comment.
Function SearchableQuerySet.annotate_scores refactored with the following changes:
- Replace assignment with augmented assignment (
aug-assign)
Comment on lines
-272
to
+277
| search_fields = [] | ||
| for f in self.model._meta.get_fields(): | ||
| if isinstance(f, (CharField, TextField)): | ||
| search_fields.append(f.name) | ||
| search_fields = [ | ||
| f.name | ||
| for f in self.model._meta.get_fields() | ||
| if isinstance(f, (CharField, TextField)) | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function SearchableManager.get_search_fields refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension)
Comment on lines
-206
to
+224
| if (cache_installed() and request.method == "GET" and | ||
| not is_authenticated(request.user)): | ||
| cache_key = cache_key_prefix(request) + request.get_full_path() | ||
| response = cache_get(cache_key) | ||
| # We need to force a csrf token here, as new sessions | ||
| # won't receieve one on their first request, with cache | ||
| # middleware running. | ||
| if csrf_middleware_installed(): | ||
| csrf_mw = CsrfViewMiddleware() | ||
| csrf_mw.process_view(request, lambda x: None, None, None) | ||
| get_token(request) | ||
| if response is None: | ||
| request._update_cache = True | ||
| else: | ||
| return HttpResponse(response) | ||
| if ( | ||
| not cache_installed() | ||
| or request.method != "GET" | ||
| or is_authenticated(request.user) | ||
| ): | ||
| return | ||
| cache_key = cache_key_prefix(request) + request.get_full_path() | ||
| response = cache_get(cache_key) | ||
| # We need to force a csrf token here, as new sessions | ||
| # won't receieve one on their first request, with cache | ||
| # middleware running. | ||
| if csrf_middleware_installed(): | ||
| csrf_mw = CsrfViewMiddleware() | ||
| csrf_mw.process_view(request, lambda x: None, None, None) | ||
| get_token(request) | ||
| if response is None: | ||
| request._update_cache = True | ||
| else: | ||
| return HttpResponse(response) |
There was a problem hiding this comment.
Function FetchFromCacheMiddleware.process_request refactored with the following changes:
- Add guard clause (
last-if-guard)
| warnings = [] | ||
| warnings.extend(run_pyflakes_for_package("mezzanine")) | ||
| warnings = list(run_pyflakes_for_package("mezzanine")) |
There was a problem hiding this comment.
Function CoreTests.test_syntax refactored with the following changes:
- Merge extend into list declaration (
merge-list-extend)
| if name in template_src: | ||
| prev = ' [copied from %s]' % template_src[name] | ||
| else: | ||
| prev = '' | ||
| prev = ' [copied from %s]' % template_src[name] if name in template_src else '' |
There was a problem hiding this comment.
Function Command.handle refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
| self.assertTrue(all([image.description for image in images])) | ||
| self.assertTrue(all(image.description for image in images)) |
There was a problem hiding this comment.
Function GalleriesTests.test_gallery_import refactored with the following changes:
- Replace unneeded comprehension with generator (
comprehension-to-generator)
Comment on lines
-214
to
+216
| string_field_name = list(self.fields.keys())[0] % \ | ||
| self.related_field_name | ||
| if hasattr(cls, "search_fields") and name in cls.search_fields: | ||
| string_field_name = list(self.fields.keys())[0] % \ | ||
| self.related_field_name |
There was a problem hiding this comment.
Function KeywordsField.contribute_to_class refactored with the following changes:
- Move assignments closer to their usage (
move-assign)
| if callable(self.default): | ||
| default = self.default() | ||
| else: | ||
| default = self.default | ||
| default = self.default() if callable(self.default) else self.default |
There was a problem hiding this comment.
Function MenusField.get_default refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-97
to
+98
| if self.__class__ == Page: | ||
| if self.content_model: | ||
| return self.get_content_model().description_from_content() | ||
| if self.__class__ == Page and self.content_model: | ||
| return self.get_content_model().description_from_content() |
There was a problem hiding this comment.
Function Page.description_from_content refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
Comment on lines
-54
to
+61
| if isinstance(setting_default, str): | ||
| if gethostname() in setting_default or ( | ||
| setting_default.startswith("/") and | ||
| os.path.exists(setting_default)): | ||
| setting_default = dynamic | ||
| if isinstance(setting_default, str) and ( | ||
| gethostname() in setting_default | ||
| or ( | ||
| setting_default.startswith("/") | ||
| and os.path.exists(setting_default) | ||
| ) | ||
| ): | ||
| setting_default = dynamic |
There was a problem hiding this comment.
Function build_settings_docs refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
Comment on lines
-212
to
+221
| if hotfix or entry not in versions[version]["changes"]: | ||
| if hotfix: | ||
| versions[hotfix] = { | ||
| "changes": [entry], | ||
| "date": _changeset_date(cs).strftime("%b %d, %Y"), | ||
| } | ||
| else: | ||
| versions[version]["changes"].insert(0, entry) | ||
| if hotfix: | ||
| versions[hotfix] = { | ||
| "changes": [entry], | ||
| "date": _changeset_date(cs).strftime("%b %d, %Y"), | ||
| } | ||
| elif entry not in versions[version]["changes"]: | ||
| versions[version]["changes"].insert(0, entry) |
There was a problem hiding this comment.
Function build_changelog refactored with the following changes:
- Split conditional into multiple branches (
split-or-ifs) - Remove redundant conditional (
remove-redundant-if)
| @@ -289,14 +291,14 @@ def build_requirements(docs_path, package_name="mezzanine"): | |||
| """ | |||
| Updates the requirements file with Mezzanine's version number. | |||
| """ | |||
| mezz_string = "Mezzanine==" | |||
There was a problem hiding this comment.
Function build_requirements refactored with the following changes:
- Move assignments closer to their usage (
move-assign)
Comment on lines
-56
to
+64
| if not site_id: | ||
| try: | ||
| site = Site.objects.get(domain__iexact=domain) | ||
| except Site.DoesNotExist: | ||
| pass | ||
| else: | ||
| site_id = site.id | ||
| if cache_installed(): | ||
| cache_set(cache_key, site_id) | ||
| if not site_id: | ||
| try: | ||
| site = Site.objects.get(domain__iexact=domain) | ||
| except Site.DoesNotExist: | ||
| pass | ||
| else: | ||
| site_id = site.id | ||
| if cache_installed(): | ||
| cache_set(cache_key, site_id) |
There was a problem hiding this comment.
Function current_site_id refactored with the following changes:
- Hoist conditional out of nested conditional (
hoist-if-from-if)
| if os.path.isdir(test_path): | ||
| copy = copytree | ||
| else: | ||
| copy = copyfile | ||
| copy = copytree if os.path.isdir(test_path) else copyfile |
There was a problem hiding this comment.
Function copy_test_to_media refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Sourcery Code Quality Report (beta)✅ Merging this PR will increase code quality in the affected files by 0.02 out of 10.
Here are some functions in these files that still need a tune-up:
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! |
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: