{Pylint} Fix consider-using-with

Author: atombrella

pylintrc

@@ -15,7 +15,6 @@ reports=no
 disable=
     arguments-out-of-order,
     bad-option-value,
-    consider-using-with,
     cyclic-import,
     duplicate-code,
     fixme,

src/azure-cli/azure/cli/__main__.py

@@ -96,10 +96,12 @@ def cli_main(cli, args):
                         else:
                             upgrade_exit_code = subprocess.call(cmd, shell=platform.system() == 'Windows')
                     else:
-                        import os
-                        devnull = open(os.devnull, 'w')
                         cmd.append('-y')
-                        upgrade_exit_code = subprocess.call(cmd, shell=platform.system() == 'Windows', stdout=devnull)
+                        upgrade_exit_code = subprocess.Popen(
+                            args=cmd,
+                            shell=platform.system() == 'Windows',
+                            stdout=subprocess.DEVNULL,
+                        )
                     if az_upgrade_run and upgrade_exit_code != 0:
                         err_msg = "Auto upgrade failed with exit code {}".format(exit_code)
                         logger.warning(err_msg)

src/azure-cli/azure/cli/command_modules/acr/_archive_utils.py

@@ -162,7 +162,8 @@ def _load_dockerignore_file(source_location, original_docker_file_name):
         return None, 0
 
     encoding = "utf-8"
-    header = open(docker_ignore_file, "rb").read(len(codecs.BOM_UTF8))
+    with open(docker_ignore_file, "rb") as fp:
+        header = fp.read(len(codecs.BOM_UTF8))
     if header.startswith(codecs.BOM_UTF8):
         encoding = "utf-8-sig"
 

src/azure-cli/azure/cli/command_modules/acr/_utils.py

@@ -263,11 +263,11 @@ def get_yaml_template(cmd_value, timeout, file):
                 yaml_template += s
         else:
             if os.path.exists(file):
-                f = open(file, 'r')
-                for line in f:
-                    yaml_template += line
+                with open(file, 'r') as f:
+                    for line in f.readlines():
+                        yaml_template += line
             else:
-                raise CLIError("{0} does not exist.".format(file))
+                raise CLIError(f"{file} does not exist.")
 
     if not yaml_template:
         raise CLIError("Failed to initialize yaml template.")

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

@@ -216,8 +216,8 @@ def apim_api_schema_create(client, resource_group_name, service_name, api_id, sc
     """creates or updates an API Schema. """
 
     if schema_path is not None and schema_content is None:
-        api_file = open(schema_path, 'r')
-        content_value = api_file.read()
+        with open(schema_path, 'r') as api_file:
+            content_value = api_file.read()
         value = content_value
     elif schema_content is not None and schema_path is None:
         value = schema_content
@@ -446,8 +446,8 @@ def apim_api_import(
         api_id = uuid.uuid4().hex
 
     if specification_path is not None and specification_url is None:
-        api_file = open(specification_path, 'r')
-        content_value = api_file.read()
+        with open(specification_path, 'r') as api_file:
+            content_value = api_file.read()
         parameters.value = content_value
     elif specification_url is not None and specification_path is None:
         parameters.value = specification_url
@@ -1118,8 +1118,8 @@ def apim_graphql_resolver_list(client, resource_group_name, service_name, api_id
 def apim_graphql_resolver_policy_create(
         client, resource_group_name, service_name, api_id, resolver_id, value_path, policy_format=None, no_wait=False):
     """Creates a new Resolver policy. """
-    api_file = open(value_path, 'r')
-    content_value = api_file.read()
+    with open(value_path, 'r') as api_file:
+        content_value = api_file.read()
     value = content_value
 
     parameters = PolicyContract(

src/azure-cli/azure/cli/command_modules/apim/tests/latest/test_apim_scenario.py

@@ -384,10 +384,10 @@ def test_apim_core_service(self, resource_group, resource_group_location, storag
         service_count = len(self.cmd('apim list -g {rg}').get_output_in_json())
         pythonfile = 'gql_schema.gql'
         schemapath = os.path.join(TEST_DIR, pythonfile)
-        api_file = open(schemapath, 'r')
-        content_value = api_file.read()
-        value = content_value
-        
+        with open(schemapath, 'r') as api_file:
+            content_value = api_file.read()
+            value = content_value
+
         pythonfile = 'policy.xml'
         policypath = os.path.join(TEST_DIR, pythonfile)
 

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

@@ -3538,8 +3538,8 @@ def upload_ssl_cert(cmd, resource_group_name,
     Certificate = cmd.get_models('Certificate')
     client = web_client_factory(cmd.cli_ctx)
     webapp = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'get', slot)
-    cert_file = open(certificate_file, 'rb')
-    cert_contents = cert_file.read()
+    with open(certificate_file, 'rb') as cert_file:
+        cert_contents = cert_file.read()
     hosting_environment_profile_param = (webapp.hosting_environment_profile.name
                                          if webapp.hosting_environment_profile else '')
 

src/azure-cli/azure/cli/command_modules/backup/tests/latest/preparers.py

@@ -21,7 +21,7 @@ def __init__(self, name_prefix='clitest-vault', parameter_name='vault_name',
                  resource_group_location_parameter_name='resource_group_location',
                  resource_group_parameter_name='resource_group',
                  dev_setting_name='AZURE_CLI_TEST_DEV_BACKUP_ACCT_NAME', soft_delete=True):
-        super(VaultPreparer, self).__init__(name_prefix, 24)
+        super().__init__(name_prefix, 24)
         from azure.cli.core.mock import DummyCli
         self.cli_ctx = DummyCli()
         self.parameter_name = parameter_name
@@ -90,7 +90,7 @@ class VMPreparer(AbstractPreparer, SingleValueReplacer):
     def __init__(self, name_prefix='clitest-vm', parameter_name='vm_name',
                  resource_group_location_parameter_name='resource_group_location',
                  resource_group_parameter_name='resource_group', dev_setting_name='AZURE_CLI_TEST_DEV_BACKUP_VM_NAME'):
-        super(VMPreparer, self).__init__(name_prefix, 15)
+        super().__init__(name_prefix, 15)
         from azure.cli.core.mock import DummyCli
         self.cli_ctx = DummyCli()
         self.parameter_name = parameter_name
@@ -201,7 +201,7 @@ class PolicyPreparer(AbstractPreparer, SingleValueReplacer):
     def __init__(self, name_prefix='clitest-item', parameter_name='policy_name', vault_parameter_name='vault_name',
                  resource_group_parameter_name='resource_group',
                  instant_rp_days=None):
-        super(PolicyPreparer, self).__init__(name_prefix, 24)
+        super().__init__(name_prefix, 24)
         from azure.cli.core.mock import DummyCli
         self.cli_ctx = DummyCli()
         self.parameter_name = parameter_name
@@ -256,7 +256,7 @@ class RPPreparer(AbstractPreparer, SingleValueReplacer):
     def __init__(self, name_prefix='clitest-rp', parameter_name='rp_name', vm_parameter_name='vm_name',
                  vault_parameter_name='vault_name',
                  resource_group_parameter_name='resource_group', dev_setting_name='AZURE_CLI_TEST_DEV_BACKUP_RP_NAME'):
-        super(RPPreparer, self).__init__(name_prefix, 24)
+        super().__init__(name_prefix, 24)
         from azure.cli.core.mock import DummyCli
         self.cli_ctx = DummyCli()
         self.parameter_name = parameter_name
@@ -708,13 +708,13 @@ def _get_file_share(self, **kwargs):
 
 class FilePreparer(AbstractPreparer, SingleValueReplacer):
     def __init__(self, name_prefix='clitest-file', parameter_name='file_name'):
-        super(FilePreparer, self).__init__(name_prefix, 24)
+        super().__init__(name_prefix, 24)
         self.parameter_name = parameter_name
 
     def create_resource(self, name, **kwargs):
         if not os.environ.get('AZURE_CLI_TEST_DEV_BACKUP_RP_NAME', None):
-            f = open(name, "a")
-            f.close()
+            with open(name, "a") as f:
+                pass
             return {self.parameter_name: name}
         return {self.parameter_name: os.environ.get('AZURE_CLI_TEST_DEV_BACKUP_RP_NAME', None)}
 

src/azure-cli/azure/cli/command_modules/containerapp/_archive_utils.py

@@ -160,7 +160,8 @@ def _load_dockerignore_file(source_location, original_docker_file_name):
         return None, 0
 
     encoding = "utf-8"
-    header = open(docker_ignore_file, "rb").read(len(codecs.BOM_UTF8))
+    with open(docker_ignore_file, "rb") as f:
+        header = f.read(len(codecs.BOM_UTF8))
     if header.startswith(codecs.BOM_UTF8):
         encoding = "utf-8-sig"
 

src/azure-cli/azure/cli/command_modules/containerapp/tests/latest/common.py

@@ -4,16 +4,15 @@
 # --------------------------------------------------------------------------------------------
 
 import os
-from azure.cli.testsdk import (ScenarioTest)
+from azure.cli.testsdk import ScenarioTest
 
 TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
 TEST_LOCATION = os.getenv("CLITestLocation") if os.getenv("CLITestLocation") else "eastus"
 
 
 def write_test_file(filename, content):
-    test_file = open(filename, "w", encoding='utf-8')
-    _ = test_file.write(content)
-    test_file.close()
+    with open(filename, "w", encoding='utf-8') as test_file:
+        test_file.write(content)
 
 
 def clean_up_test_file(filename):