2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-02 11:40:58 +00:00

refactor: refactor unnecessary else / elif when if block has a return statement (#5735)

The use of `else` or `elif` becomes redundant and can be dropped if the last statement under the leading `if` / `elif` block is a `return` statement.
In the case of an `elif` after `return`, it can be written as a separate `if` block.
For `else` blocks after `return`, the statements can be shifted out of `else`. Please refer to the examples below for reference.

Refactoring the code this way can improve code-readability and make it easier to maintain.

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
This commit is contained in:
Matthias Mair
2023-10-18 00:06:54 +02:00
committed by GitHub
parent 3f93151cca
commit eb79bd1743
29 changed files with 123 additions and 235 deletions

View File

@ -16,8 +16,7 @@ class SettingsAdmin(ImportExportModelAdmin):
"""Prevent the 'key' field being edited once the setting is created."""
if obj:
return ['key']
else:
return []
return []
class UserSettingsAdmin(ImportExportModelAdmin):
@ -29,8 +28,7 @@ class UserSettingsAdmin(ImportExportModelAdmin):
"""Prevent the 'key' field being edited once the setting is created."""
if obj:
return ['key']
else:
return []
return []
class WebhookAdmin(ImportExportModelAdmin):

View File

@ -206,9 +206,8 @@ class GlobalSettingsPermissions(permissions.BasePermission):
if request.method in ['GET', 'HEAD', 'OPTIONS']:
return True
else:
# Any other methods require staff access permissions
return user.is_staff
# Any other methods require staff access permissions
return user.is_staff
except AttributeError: # pragma: no cover
return False

View File

@ -404,8 +404,7 @@ class BaseInvenTreeSetting(models.Model):
if settings is not None and key in settings:
return settings[key]
else:
return {}
return {}
@classmethod
def get_setting_name(cls, key, **kwargs):
@ -458,8 +457,7 @@ class BaseInvenTreeSetting(models.Model):
if callable(default):
return default()
else:
return default
return default
@classmethod
def get_setting_choices(cls, key, **kwargs):
@ -881,9 +879,7 @@ class BaseInvenTreeSetting(models.Model):
elif self.is_model():
return 'related field'
else:
return 'string'
return 'string'
@classmethod
def validator_is_bool(cls, validator):
@ -1891,8 +1887,7 @@ class InvenTreeSetting(BaseInvenTreeSetting):
if options:
return options.get('requires_restart', False)
else:
return False
return False
def label_printer_options():
@ -2430,8 +2425,7 @@ def get_price(instance, quantity, moq=True, multiples=True, currency=None, break
if pb_found:
cost = pb_cost * quantity
return InvenTree.helpers.normalize(cost + instance.base_cost)
else:
return None
return None
class ColorTheme(models.Model):

View File

@ -480,8 +480,7 @@ class FileManagementAjaxView(AjaxView):
self.render_done(form)
data = {'form_valid': True, 'success': _('Parts imported')}
return self.renderJsonResponse(request, data=data)
else:
self.storage.current_step = self.steps.next
self.storage.current_step = self.steps.next
return self.renderJsonResponse(request, data={'form_valid': None})