Skip to content

{Pylint} Fix no-else-continue #18001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiasli merged 2 commits into from
May 17, 2021
Merged

{Pylint} Fix no-else-continue #18001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5340b8b
{Pylint} Fix `no-else-continue`
jiasli May 7, 2021
e2b9b72
Merge branch 'dev' into no-else-continue
jiasli May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ disable=
locally-disabled,
missing-docstring,
missing-kwoa,
no-else-continue,
no-member,
no-value-for-parameter,
raise-missing-from,
Expand Down
3 changes: 1 addition & 2 deletions src/azure-cli-core/azure/cli/core/azlogging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ def _get_clean_args(command, args): # TODO: add test for this function
continue

# else if positional or optional argument / value
else:
cleaned_args.append(placeholder)
cleaned_args.append(placeholder)

return cleaned_args

Expand Down
14 changes: 7 additions & 7 deletions src/azure-cli/azure/cli/command_modules/ams/operations/sp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,13 @@ def _assign_role(cmd, role, sp_oid, scope):
logger.warning('Retrying role assignment creation: %s/%s', retry_time + 1,
_RETRY_TIMES)
continue
else:
# dump out history for diagnoses
logger.warning('Role assignment creation failed.\n')
if getattr(ex, 'response', None) is not None:
logger.warning('role assignment response headers: %s\n',
ex.response.headers) # pylint: disable=no-member
raise

# dump out history for diagnoses
logger.warning('Role assignment creation failed.\n')
if getattr(ex, 'response', None) is not None:
logger.warning('role assignment response headers: %s\n',
ex.response.headers) # pylint: disable=no-member
raise


def _build_sp_result(subscription_id, location, resource_group_name, account_name,
Expand Down
11 changes: 5 additions & 6 deletions src/azure-cli/azure/cli/command_modules/batch/_command_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,12 +488,11 @@ def _execute_command(kwargs):
param_value = kwargs.pop(arg)
if param_value is None:
continue
else:
self._build_parameters(
details['path'],
kwargs,
details['root'],
param_value)
self._build_parameters(
details['path'],
kwargs,
details['root'],
param_value)
except KeyError:
continue

Expand Down
14 changes: 7 additions & 7 deletions src/azure-cli/azure/cli/command_modules/role/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,15 +1493,15 @@ def create_service_principal_for_rbac(
logger.warning(' Retrying role assignment creation: %s/%s', retry_time + 1,
_RETRY_TIMES)
continue
elif _error_caused_by_role_assignment_exists(ex):
if _error_caused_by_role_assignment_exists(ex):
logger.warning(' Role assignment already exists.\n')
break
Copy link
Member

@qwordy qwordy May 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is no-else-break.

Copy link
Member Author

@jiasli jiasli May 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, but I am not sure why it is not detected in #18000.

else:
# dump out history for diagnoses
logger.warning(' Role assignment creation failed.\n')
if getattr(ex, 'response', None) is not None:
logger.warning(' role assignment response headers: %s\n',
ex.response.headers) # pylint: disable=no-member

# dump out history for diagnoses
logger.warning(' Role assignment creation failed.\n')
if getattr(ex, 'response', None) is not None:
logger.warning(' role assignment response headers: %s\n',
ex.response.headers) # pylint: disable=no-member
raise

logger.warning(CREDENTIAL_WARNING_MESSAGE)
Expand Down