[Storage] [Next-Pylint] Blob Package (Azure#30676)

* Pylint

* Pylint 2

* Pop back in no-self-use since current pipeline uses it

* Fix failing test

* Fixes

* revert pylintrc

* Skip dunder

* Add back in dunder to appease current pylint

Author: vincenttran-msft

sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py

@@ -179,7 +179,7 @@ def download_blob_from_url(
             _download_to_stream(client, output, **kwargs)
         else:
             if not overwrite and os.path.isfile(output):
-                raise ValueError("The file '{}' already exists.".format(output))
+                raise ValueError(f"The file '{output}' already exists.")
             with open(output, 'wb') as file_handle:
                 _download_to_stream(client, file_handle, **kwargs)
 

sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py

@@ -166,7 +166,7 @@ def __init__(
         if not (container_name and blob_name):
             raise ValueError("Please specify a container name and blob name.")
         if not parsed_url.netloc:
-            raise ValueError("Invalid URL: {}".format(account_url))
+            raise ValueError(f"Invalid URL: {account_url}")
 
         path_snapshot, sas_token = parse_query(parsed_url.query)
 
@@ -192,20 +192,15 @@ def _format_url(self, hostname):
         container_name = self.container_name
         if isinstance(container_name, str):
             container_name = container_name.encode('UTF-8')
-        return "{}://{}/{}/{}{}".format(
-            self.scheme,
-            hostname,
-            quote(container_name),
-            quote(self.blob_name, safe='~/'),
-            self._query_str)
+        return f"{self.scheme}://{hostname}/{quote(container_name)}/{quote(self.blob_name, safe='~/')}{self._query_str}"
 
     def _encode_source_url(self, source_url):
         parsed_source_url = urlparse(source_url)
         source_scheme = parsed_source_url.scheme
         source_hostname = parsed_source_url.netloc.rstrip('/')
         source_path = unquote(parsed_source_url.path)
         source_query = parsed_source_url.query
-        result = ["{}://{}{}".format(source_scheme, source_hostname, quote(source_path, safe='~/'))]
+        result = [f"{source_scheme}://{source_hostname}{quote(source_path, safe='~/')}"]
         if source_query:
             result.append(source_query)
         return '?'.join(result)
@@ -248,7 +243,7 @@ def from_blob_url(
         parsed_url = urlparse(blob_url.rstrip('/'))
 
         if not parsed_url.netloc:
-            raise ValueError("Invalid URL: {}".format(blob_url))
+            raise ValueError(f"Invalid URL: {blob_url}")
 
         account_path = ""
         if ".core." in parsed_url.netloc:
@@ -263,11 +258,7 @@ def from_blob_url(
             if len(path_blob) > 2:
                 account_path = "/" + "/".join(path_blob[:-2])
 
-        account_url = "{}://{}{}?{}".format(
-            parsed_url.scheme,
-            parsed_url.netloc.rstrip('/'),
-            account_path,
-            parsed_url.query)
+        account_url = f"{parsed_url.scheme}://{parsed_url.netloc.rstrip('/')}{account_path}?{parsed_url.query}"
 
         msg_invalid_url = "Invalid URL. Provide a blob_url with a valid blob and container name."
         if len(path_blob) <= 1:
@@ -389,7 +380,7 @@ def _upload_blob_options(  # pylint:disable=too-many-statements
         elif hasattr(data, '__aiter__'):
             stream = AsyncIterStreamer(data, encoding=encoding)
         else:
-            raise TypeError("Unsupported data type: {}".format(type(data)))
+            raise TypeError(f"Unsupported data type: {type(data)}")
 
         validate_content = kwargs.pop('validate_content', False)
         content_settings = kwargs.pop('content_settings', None)
@@ -440,7 +431,7 @@ def _upload_blob_options(  # pylint:disable=too-many-statements
                 raise ValueError(_ERROR_UNSUPPORTED_METHOD_FOR_ENCRYPTION)
             kwargs['client'] = self._client.append_blob
         else:
-            raise ValueError("Unsupported BlobType: {}".format(blob_type))
+            raise ValueError(f"Unsupported BlobType: {blob_type}")
         return kwargs
 
     def _upload_blob_from_url_options(self, source_url, **kwargs):
@@ -3469,7 +3460,7 @@ def _upload_page_options( # type: ignore
         if length is None or length % 512 != 0:
             raise ValueError("length must be an integer that aligns with 512 page size")
         end_range = offset + length - 1  # Reformat to an inclusive range index
-        content_range = 'bytes={0}-{1}'.format(offset, end_range) # type: ignore
+        content_range = f'bytes={offset}-{end_range}' # type: ignore
         access_conditions = get_access_conditions(kwargs.pop('lease', None))
         seq_conditions = SequenceNumberAccessConditions(
             if_sequence_number_less_than_or_equal_to=kwargs.pop('if_sequence_number_lte', None),
@@ -3622,8 +3613,8 @@ def _upload_pages_from_url_options(  # type: ignore
 
         # Format range
         end_range = offset + length - 1
-        destination_range = 'bytes={0}-{1}'.format(offset, end_range)
-        source_range = 'bytes={0}-{1}'.format(source_offset, source_offset + length - 1)  # should subtract 1 here?
+        destination_range = f'bytes={offset}-{end_range}'
+        source_range = f'bytes={source_offset}-{source_offset + length - 1}'  # should subtract 1 here?
 
         seq_conditions = SequenceNumberAccessConditions(
             if_sequence_number_less_than_or_equal_to=kwargs.pop('if_sequence_number_lte', None),
@@ -3796,7 +3787,7 @@ def _clear_page_options(self, offset, length, **kwargs):
         if length is None or length % 512 != 0:
             raise ValueError("length must be an integer that aligns with 512 page size")
         end_range = length + offset - 1  # Reformat to an inclusive range index
-        content_range = 'bytes={0}-{1}'.format(offset, end_range)
+        content_range = f'bytes={offset}-{end_range}'
 
         cpk = kwargs.pop('cpk', None)
         cpk_info = None
@@ -4054,9 +4045,9 @@ def _append_block_from_url_options(  # type: ignore
         source_range = None
         if source_length is not None:
             end_range = source_offset + source_length - 1
-            source_range = 'bytes={0}-{1}'.format(source_offset, end_range)
+            source_range = f'bytes={source_offset}-{end_range}'
         elif source_offset is not None:
-            source_range = "bytes={0}-".format(source_offset)
+            source_range = f"bytes={source_offset}-"
 
         appendpos_condition = kwargs.pop('appendpos_condition', None)
         maxsize_condition = kwargs.pop('maxsize_condition', None)
@@ -4307,7 +4298,7 @@ def _get_container_client(self): # pylint: disable=client-method-missing-kwargs
         else:
             _pipeline = self._pipeline   # pylint: disable = protected-access
         return ContainerClient(
-            "{}://{}".format(self.scheme, self.primary_hostname), container_name=self.container_name,
+            f"{self.scheme}://{self.primary_hostname}", container_name=self.container_name,
             credential=self._raw_credential, api_version=self.api_version, _configuration=self._config,
             _pipeline=_pipeline, _location_mode=self._location_mode, _hosts=self._hosts,
             require_encryption=self.require_encryption, encryption_version=self.encryption_version,

sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py

@@ -130,7 +130,7 @@ def __init__(
             raise ValueError("Account URL must be a string.")
         parsed_url = urlparse(account_url.rstrip('/'))
         if not parsed_url.netloc:
-            raise ValueError("Invalid URL: {}".format(account_url))
+            raise ValueError(f"Invalid URL: {account_url}")
 
         _, sas_token = parse_query(parsed_url.query)
         self._query_str, credential = self._format_query_string(sas_token, credential)
@@ -143,7 +143,7 @@ def _format_url(self, hostname):
         """Format the endpoint URL according to the current location
         mode hostname.
         """
-        return "{}://{}/{}".format(self.scheme, hostname, self._query_str)
+        return f"{self.scheme}://{hostname}/{self._query_str}"
 
     @classmethod
     def from_connection_string(

sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.py

@@ -150,7 +150,7 @@ def __init__(
         if not container_name:
             raise ValueError("Please specify a container name.")
         if not parsed_url.netloc:
-            raise ValueError("Invalid URL: {}".format(account_url))
+            raise ValueError(f"Invalid URL: {account_url}")
 
         _, sas_token = parse_query(parsed_url.query)
         self.container_name = container_name
@@ -171,11 +171,7 @@ def _format_url(self, hostname):
         container_name = self.container_name
         if isinstance(container_name, str):
             container_name = container_name.encode('UTF-8')
-        return "{}://{}/{}{}".format(
-            self.scheme,
-            hostname,
-            quote(container_name),
-            self._query_str)
+        return f"{self.scheme}://{hostname}/{quote(container_name)}{self._query_str}"
 
     @classmethod
     def from_container_url(
@@ -209,17 +205,13 @@ def from_container_url(
             raise ValueError("Container URL must be a string.")
         parsed_url = urlparse(container_url)
         if not parsed_url.netloc:
-            raise ValueError("Invalid URL: {}".format(container_url))
+            raise ValueError(f"Invalid URL: {container_url}")
 
         container_path = parsed_url.path.strip('/').split('/')
         account_path = ""
         if len(container_path) > 1:
             account_path = "/" + "/".join(container_path[:-1])
-        account_url = "{}://{}{}?{}".format(
-            parsed_url.scheme,
-            parsed_url.netloc.rstrip('/'),
-            account_path,
-            parsed_url.query)
+        account_url = f"{parsed_url.scheme}://{parsed_url.netloc.rstrip('/')}{account_path}?{parsed_url.query}"
         container_name = unquote(container_path[-1])
         if not container_name:
             raise ValueError("Invalid URL. Please provide a URL with a valid container name")
@@ -347,7 +339,7 @@ def _rename_container(self, new_name, **kwargs):
             kwargs['source_lease_id'] = lease
         try:
             renamed_container = ContainerClient(
-                "{}://{}".format(self.scheme, self.primary_hostname), container_name=new_name,
+                f"{self.scheme}://{self.primary_hostname}", container_name=new_name,
                 credential=self.credential, api_version=self.api_version, _configuration=self._config,
                 _pipeline=self._pipeline, _location_mode=self._location_mode, _hosts=self._hosts,
                 require_encryption=self.require_encryption, encryption_version=self.encryption_version,
@@ -655,7 +647,7 @@ def _get_blob_service_client(self):  # pylint: disable=client-method-missing-kwa
         else:
             _pipeline = self._pipeline   # pylint: disable = protected-access
         return BlobServiceClient(
-            "{}://{}".format(self.scheme, self.primary_hostname),
+            f"{self.scheme}://{self.primary_hostname}",
             credential=self._raw_credential, api_version=self.api_version, _configuration=self._config,
             _location_mode=self._location_mode, _hosts=self._hosts, require_encryption=self.require_encryption,
             encryption_version=self.encryption_version, key_encryption_key=self.key_encryption_key,
@@ -1407,7 +1399,7 @@ def _generate_delete_blobs_options(
 
             req = HttpRequest(
                 "DELETE",
-                "/{}/{}{}".format(quote(container_name), quote(blob_name, safe='/~'), self._query_str),
+                f"/{quote(container_name)}/{quote(blob_name, safe='/~')}{self._query_str}",
                 headers=header_parameters
             )
             req.format_parameters(query_parameters)
@@ -1507,7 +1499,7 @@ def delete_blobs(
                 :caption: Deleting multiple blobs.
         """
         if len(blobs) == 0:
-            return iter(list())
+            return iter([])
 
         reqs, options = self._generate_delete_blobs_options(*blobs, **kwargs)
 
@@ -1593,7 +1585,7 @@ def _generate_set_tiers_options(
 
             req = HttpRequest(
                 "PUT",
-                "/{}/{}{}".format(quote(container_name), quote(blob_name, safe='/~'), self._query_str),
+                f"/{quote(container_name)}/{quote(blob_name, safe='/~')}{self._query_str}",
                 headers=header_parameters
             )
             req.format_parameters(query_parameters)

sdk/storage/azure-storage-blob/azure/storage/blob/_deserialize.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=no-self-use
 
 from typing import (
     Dict, List, Optional, Tuple, Union,
@@ -76,7 +75,7 @@ def deserialize_ors_policies(policy_dictionary):
         rule_id = policy_and_rule_ids[1]
 
         # If we are seeing this policy for the first time, create a new list to store rule_id -> result
-        parsed_result[policy_id] = parsed_result.get(policy_id) or list()
+        parsed_result[policy_id] = parsed_result.get(policy_id) or []
         parsed_result[policy_id].append(ObjectReplicationRule(rule_id=rule_id, status=val))
 
     result_list = [ObjectReplicationPolicy(policy_id=k, rules=v) for k, v in parsed_result.items()]

sdk/storage/azure-storage-blob/azure/storage/blob/_download.py

@@ -373,11 +373,7 @@ def __init__(
         self.properties.size = self.size
 
         # Overwrite the content range to the user requested range
-        self.properties.content_range = "bytes {0}-{1}/{2}".format(
-            self._start_range,
-            self._end_range,
-            self._file_size
-        )
+        self.properties.content_range = f"bytes {self._start_range}-{self._end_range}/{self._file_size}"
 
         # Overwrite the content MD5 as it is the MD5 for the last range instead
         # of the stored MD5
@@ -456,8 +452,8 @@ def _initial_request(self):
                             download_stream_current=0,
                             **self._request_options
                         )
-                    except HttpResponseError as error:
-                        process_storage_error(error)
+                    except HttpResponseError as e:
+                        process_storage_error(e)
 
                     # Set the download size to empty
                     self.size = 0

sdk/storage/azure-storage-blob/azure/storage/blob/_encryption.py

@@ -41,7 +41,7 @@
 
 def _validate_not_none(param_name, param):
     if param is None:
-        raise ValueError('{0} should not be None.'.format(param_name))
+        raise ValueError(f'{param_name} should not be None.')
 
 
 def _validate_key_encryption_key_wrap(kek):

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/_configuration.py

@@ -37,7 +37,7 @@ def __init__(self, url: str, **kwargs: Any) -> None:
 
         self.url = url
         self.version = version
-        kwargs.setdefault("sdk_moniker", "azureblobstorage/{}".format(VERSION))
+        kwargs.setdefault("sdk_moniker", f"azureblobstorage/{VERSION}")
         self._configure(**kwargs)
 
     def _configure(

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/_serialization.py

@@ -1967,4 +1967,4 @@ def deserialize_unix(attr):
             msg = "Cannot deserialize to unix datetime object."
             raise_with_traceback(DeserializationError, msg, err)
         else:
-            return date_obj
+            return date_obj

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/_vendor.py

@@ -24,4 +24,4 @@ def _format_url_section(template, **kwargs):
         except KeyError as key:
             formatted_components = template.split("/")
             components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
-            template = "/".join(components)
+            template = "/".join(components)