[style] - Update code styling

Author: william051200

src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py

@@ -35,7 +35,7 @@ def get_target_network_api(cli_ctx):
     if cli_ctx.cloud.profile == 'latest':
         version = '2022-01-01'
     else:
-        from azure.cli.core.profiles import get_api_version, ResourceType
+        from azure.cli.core.profiles import get_api_version
         version = get_api_version(cli_ctx, ResourceType.MGMT_NETWORK)
     return version
 
@@ -49,8 +49,6 @@ def read_content_if_is_file(string_or_file):
 
 
 def _resolve_api_version(cli_ctx, provider_namespace, resource_type, parent_path):
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    from azure.cli.core.profiles import ResourceType
     client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
     provider = client.providers.get(provider_namespace)
 
@@ -78,10 +76,8 @@ def log_pprint_template(template):
 def check_existence(cli_ctx, value, resource_group, provider_namespace, resource_type,
                     parent_name=None, parent_type=None, static_version=None):
     # check for name or ID and set the type flags
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
     from azure.core.exceptions import HttpResponseError
     from azure.mgmt.core.tools import parse_resource_id
-    from azure.cli.core.profiles import ResourceType
     id_parts = parse_resource_id(value)
     resource_client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,
                                               subscription_id=id_parts.get('subscription', None)).resources
@@ -417,8 +413,6 @@ def _update(model, lun, value):
 
 
 def get_storage_blob_uri(cli_ctx, storage):
-    from azure.cli.core.profiles._shared import ResourceType
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
     if urlparse(storage).scheme:
         storage_uri = storage
     else:

src/azure-cli/azure/cli/command_modules/vm/custom.py

@@ -23,7 +23,6 @@
 from knack.log import get_logger
 from knack.util import CLIError
 from azure.cli.core.azclierror import (
-    CLIInternalError,
     ResourceNotFoundError,
     ValidationError,
     RequiredArgumentMissingError,
@@ -2592,7 +2591,8 @@ def _remove_identities_by_aaz(cmd, resource_group_name, name, identities, getter
         existing_identity['userAssignedIdentities'] = None
 
     if remove_system_assigned_identity:
-        if existing_identity['type'] == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value or existing_identity['type'] == IdentityType.USER_ASSIGNED.value:
+        if existing_identity['type'] == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value \
+                or existing_identity['type'] == IdentityType.USER_ASSIGNED.value:
             existing_identity['type'] = IdentityType.USER_ASSIGNED.value
         else:
             existing_identity['type'] = IdentityType.NONE.value
@@ -2610,12 +2610,15 @@ def setter(resource_group_name, vm_name, vm):
 
         from ._vm_utils import IdentityType
         if vm.get('identity') and vm.get('identity').get('type') == IdentityType.USER_ASSIGNED.value:
-            command_args['mi_user_assigned'] = [key for key in (vm.get('identity').get('userAssignedIdentities') or {}).keys()] + ['UserAssigned']
+            command_args['mi_user_assigned'] = \
+                ([key for key in list((vm.get('identity', {}).get('userAssignedIdentities', {})).keys())] +
+                 ['UserAssigned'])
         elif vm.get('identity') and vm.get('identity').get('type') == IdentityType.SYSTEM_ASSIGNED.value:
             command_args['mi_user_assigned'] = []
             command_args['mi_system_assigned'] = 'True'
         elif vm.get('identity') and vm.get('identity').get('type') == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value:
-            command_args['mi_user_assigned'] = [key for key in (vm.get('identity').get('userAssignedIdentities') or {}).keys()]
+            command_args['mi_user_assigned'] = \
+                [key for key in list((vm.get('identity', {}).get('userAssignedIdentities', {})).keys())]
             command_args['mi_system_assigned'] = 'True'
         else:
             command_args['mi_user_assigned'] = []