Merge pull request #9408 from aws/lint-unsafe-botocore-s3transfer

Lint botocore and s3transfer with --unsafe-fixes

Author: kdaily

awscli/botocore/auth.py

@@ -130,7 +130,7 @@ def calc_signature(self, request, params):
         path = split.path
         if len(path) == 0:
             path = '/'
-        string_to_sign = '%s\n%s\n%s\n' % (request.method, split.netloc, path)
+        string_to_sign = f'{request.method}\n{split.netloc}\n{path}\n'
         lhmac = hmac.new(
             self.credentials.secret_key.encode('utf-8'), digestmod=sha256
         )
@@ -199,8 +199,7 @@ def add_auth(self, request):
         new_hmac.update(request.headers['Date'].encode('utf-8'))
         encoded_signature = encodebytes(new_hmac.digest()).strip()
         signature = (
-            'AWS3-HTTPS AWSAccessKeyId=%s,Algorithm=%s,Signature=%s'
-            % (
+            'AWS3-HTTPS AWSAccessKeyId={},Algorithm={},Signature={}'.format(
                 self.credentials.access_key,
                 'HmacSHA256',
                 encoded_signature.decode('utf-8'),
@@ -271,7 +270,7 @@ def _canonical_query_string_params(self, params):
         # Sort by the URI-encoded key names, and in the case of
         # repeated keys, then sort by the value.
         for key, value in sorted(key_val_pairs):
-            sorted_key_vals.append('%s=%s' % (key, value))
+            sorted_key_vals.append(f'{key}={value}')
         canonical_query_string = '&'.join(sorted_key_vals)
         return canonical_query_string
 
@@ -287,7 +286,7 @@ def _canonical_query_string_url(self, parts):
             # Sort by the URI-encoded key names, and in the case of
             # repeated keys, then sort by the value.
             for key, value in sorted(key_val_pairs):
-                sorted_key_vals.append('%s=%s' % (key, value))
+                sorted_key_vals.append(f'{key}={value}')
             canonical_query_string = '&'.join(sorted_key_vals)
         return canonical_query_string
 
@@ -304,7 +303,7 @@ def canonical_headers(self, headers_to_sign):
             value = ','.join(
                 self._header_value(v) for v in headers_to_sign.get_all(key)
             )
-            headers.append('%s:%s' % (key, ensure_unicode(value)))
+            headers.append(f'{key}:{ensure_unicode(value)}')
         return '\n'.join(headers)
 
     def _header_value(self, value):
@@ -316,9 +315,8 @@ def _header_value(self, value):
         return ' '.join(value.split())
 
     def signed_headers(self, headers_to_sign):
-        l = ['%s' % n.lower().strip() for n in set(headers_to_sign)]
-        l = sorted(l)
-        return ';'.join(l)
+        headers = sorted(n.lower().strip() for n in set(headers_to_sign))
+        return ';'.join(headers)
 
     def _is_streaming_checksum_payload(self, request):
         checksum_context = request.context.get('checksum', {})
@@ -437,11 +435,13 @@ def add_auth(self, request):
         self._inject_signature_to_request(request, signature)
 
     def _inject_signature_to_request(self, request, signature):
-        l = ['AWS4-HMAC-SHA256 Credential=%s' % self.scope(request)]
+        auth_str = [f'AWS4-HMAC-SHA256 Credential={self.scope(request)}']
         headers_to_sign = self.headers_to_sign(request)
-        l.append('SignedHeaders=%s' % self.signed_headers(headers_to_sign))
-        l.append('Signature=%s' % signature)
-        request.headers['Authorization'] = ', '.join(l)
+        auth_str.append(
+            f"SignedHeaders={self.signed_headers(headers_to_sign)}"
+        )
+        auth_str.append(f'Signature={signature}')
+        request.headers['Authorization'] = ', '.join(auth_str)
         return request
 
     def _modify_request_before_signing(self, request):
@@ -480,7 +480,7 @@ def _set_necessary_date_headers(self, request):
 
 class S3SigV4Auth(SigV4Auth):
     def _modify_request_before_signing(self, request):
-        super(S3SigV4Auth, self)._modify_request_before_signing(request)
+        super()._modify_request_before_signing(request)
         if 'X-Amz-Content-SHA256' in request.headers:
             del request.headers['X-Amz-Content-SHA256']
 
@@ -525,7 +525,7 @@ def _should_sha256_sign_payload(self, request):
 
         # If the S3-specific checks had no results, delegate to the generic
         # checks.
-        return super(S3SigV4Auth, self)._should_sha256_sign_payload(request)
+        return super()._should_sha256_sign_payload(request)
 
     def _normalize_url_path(self, path):
         # For S3, we do not normalize the path.
@@ -688,7 +688,7 @@ def _inject_signature_to_request(self, request, signature):
         # Rather than calculating an "Authorization" header, for the query
         # param quth, we just append an 'X-Amz-Signature' param to the end
         # of the query string.
-        request.url += '&X-Amz-Signature=%s' % signature
+        request.url += f'&X-Amz-Signature={signature}'
 
     def _normalize_url_path(self, path):
         # For S3, we do not normalize the path.
@@ -708,9 +708,7 @@ class SigV4QueryAuth(SigV4Auth):
     def __init__(
         self, credentials, service_name, region_name, expires=DEFAULT_EXPIRES
     ):
-        super(SigV4QueryAuth, self).__init__(
-            credentials, service_name, region_name
-        )
+        super().__init__(credentials, service_name, region_name)
         self._expires = expires
 
     def _modify_request_before_signing(self, request):
@@ -784,7 +782,7 @@ def _inject_signature_to_request(self, request, signature):
         # Rather than calculating an "Authorization" header, for the query
         # param quth, we just append an 'X-Amz-Signature' param to the end
         # of the query string.
-        request.url += '&X-Amz-Signature=%s' % signature
+        request.url += f'&X-Amz-Signature={signature}'
 
 
 class S3SigV4QueryAuth(SigV4QueryAuth):
@@ -881,7 +879,7 @@ def add_auth(self, request):
 # the botocore.crt.auth module imports functions/classes defined above from
 # this module. In the future, we should isolate those functions/classes into
 # a separate utility module to avoid any potential circular import.
-import botocore.crt.auth
+import botocore.crt.auth  # noqa
 
 
 def resolve_auth_type(auth_trait):

awscli/botocore/awsrequest.py

@@ -64,7 +64,7 @@ class AWSConnection:
     """
 
     def __init__(self, *args, **kwargs):
-        super(AWSConnection, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._original_response_cls = self.response_class
         # We'd ideally hook into httplib's states, but they're all
         # __mangled_vars so we use our own state var.  This variable is set
@@ -78,7 +78,7 @@ def __init__(self, *args, **kwargs):
         self._expect_header_set = False
 
     def close(self):
-        super(AWSConnection, self).close()
+        super().close()
         # Reset all of our instance state we were tracking.
         self._response_received = False
         self._expect_header_set = False
@@ -91,7 +91,7 @@ def _send_request(self, method, url, body, headers, *args, **kwargs):
         else:
             self._expect_header_set = False
             self.response_class = self._original_response_cls
-        rval = super(AWSConnection, self)._send_request(
+        rval = super()._send_request(
             method, url, body, headers, *args, **kwargs
         )
         self._expect_header_set = False
@@ -215,7 +215,7 @@ def send(self, str):
                 "Not sending data."
             )
             return
-        return super(AWSConnection, self).send(str)
+        return super().send(str)
 
     def _is_100_continue_status(self, maybe_status_line):
         parts = maybe_status_line.split(None, 2)
@@ -275,9 +275,9 @@ def prepare_request_dict(
         percent_encode_sequence = botocore.utils.percent_encode_sequence
         encoded_query_string = percent_encode_sequence(r['query_string'])
         if '?' not in url:
-            url += '?%s' % encoded_query_string
+            url += f'?{encoded_query_string}'
         else:
-            url += '&%s' % encoded_query_string
+            url += f'&{encoded_query_string}'
     r['url'] = url
     r['context'] = context
     if context is None:
@@ -371,7 +371,7 @@ def _prepare_url(self, original):
         url = original.url
         if original.params:
             params = urlencode(list(original.params.items()), doseq=True)
-            url = '%s?%s' % (url, params)
+            url = f'{url}?{params}'
         return url
 
     def _prepare_headers(self, original, prepared_body=None):

awscli/botocore/client.py

@@ -190,7 +190,7 @@ def _create_client_class(self, service_name, service_model):
         bases = [BaseClient]
         service_id = service_model.service_id.hyphenize()
         self._event_emitter.emit(
-            'creating-client-class.%s' % service_id,
+            f'creating-client-class.{service_id}',
             class_attributes=class_attributes,
             base_classes=bases,
         )
@@ -214,10 +214,9 @@ def _normalize_fips_region(self, region_name, client_config):
                 else:
                     client_config = config_use_fips_endpoint
                 logger.warning(
-                    'transforming region from %s to %s and setting '
+                    f'transforming region from {region_name} to {normalized_region_name} and setting '
                     'use_fips_endpoint to true. client should not '
                     'be configured with a fips psuedo region.'
-                    % (region_name, normalized_region_name)
                 )
                 region_name = normalized_region_name
         return region_name, client_config
@@ -399,7 +398,7 @@ def _api_call(self, *args, **kwargs):
             # 1 argument.
             if args:
                 raise TypeError(
-                    "%s() only accepts keyword arguments." % py_operation_name
+                    f"{py_operation_name}() only accepts keyword arguments."
                 )
             # The "self" in this scope is referring to the BaseClient.
             return self._make_api_call(operation_name, kwargs)
@@ -413,7 +412,7 @@ def _api_call(self, *args, **kwargs):
             method_name=operation_name,
             event_emitter=self._event_emitter,
             method_description=operation_model.documentation,
-            example_prefix='response = client.%s' % py_operation_name,
+            example_prefix=f'response = client.{py_operation_name}',
             include_signature=False,
         )
         _api_call.__doc__ = docstring
@@ -626,7 +625,7 @@ def _make_url(self, hostname, is_secure, supported_protocols):
             scheme = 'https'
         else:
             scheme = 'http'
-        return '%s://%s' % (scheme, hostname)
+        return f'{scheme}://{hostname}'
 
     def _resolve_signing_name(self, service_name, resolved):
         # CredentialScope overrides everything else.
@@ -748,9 +747,8 @@ def __init__(
         self._register_handlers()
 
     def __getattr__(self, item):
-        event_name = 'getattr.%s.%s' % (
-            self._service_model.service_id.hyphenize(),
-            item,
+        event_name = (
+            f'getattr.{self._service_model.service_id.hyphenize()}.{item}'
         )
         handler, event_response = self.meta.events.emit_until_response(
             event_name, client=self
@@ -760,15 +758,14 @@ def __getattr__(self, item):
             return event_response
 
         raise AttributeError(
-            "'%s' object has no attribute '%s'"
-            % (self.__class__.__name__, item)
+            f"'{self.__class__.__name__}' object has no attribute '{item}'"
         )
 
     def _register_handlers(self):
         # Register the handler required to sign requests.
         service_id = self.meta.service_model.service_id.hyphenize()
         self.meta.events.register(
-            'request-created.%s' % service_id, self._request_signer.handler
+            f'request-created.{service_id}', self._request_signer.handler
         )
         # Rebuild user agent string right before request is sent
         # to ensure all registered features are included.
@@ -1029,11 +1026,7 @@ def paginate(self, **kwargs):
 
             # Rename the paginator class based on the type of paginator.
             paginator_class_name = str(
-                '%s.Paginator.%s'
-                % (
-                    get_service_module_name(self.meta.service_model),
-                    actual_operation_name,
-                )
+                f'{get_service_module_name(self.meta.service_model)}.Paginator.{actual_operation_name}'
             )
 
             # Create the new paginator class
@@ -1100,13 +1093,13 @@ def get_waiter(self, waiter_name):
         """
         config = self._get_waiter_config()
         if not config:
-            raise ValueError("Waiter does not exist: %s" % waiter_name)
+            raise ValueError(f"Waiter does not exist: {waiter_name}")
         model = waiter.WaiterModel(config)
         mapping = {}
         for name in model.waiter_names:
             mapping[xform_name(name)] = name
         if waiter_name not in mapping:
-            raise ValueError("Waiter does not exist: %s" % waiter_name)
+            raise ValueError(f"Waiter does not exist: {waiter_name}")
 
         return waiter.create_waiter_with_client(
             mapping[waiter_name], model, self

awscli/botocore/config.py

@@ -336,14 +336,13 @@ def _record_user_provided_options(self, args, kwargs):
                 user_provided_options[key] = value
             # The key must exist in the available options
             else:
-                raise TypeError('Got unexpected keyword argument \'%s\'' % key)
+                raise TypeError(f'Got unexpected keyword argument \'{key}\'')
 
         # The number of args should not be longer than the allowed
         # options
         if len(args) > len(option_order):
             raise TypeError(
-                'Takes at most %s arguments (%s given)'
-                % (len(option_order), len(args))
+                f'Takes at most {len(option_order)} arguments ({len(args)} given)'
             )
 
         # Iterate through the args passed through to the constructor and map
@@ -352,8 +351,7 @@ def _record_user_provided_options(self, args, kwargs):
             # If it a kwarg was specified for the arg, then error out
             if option_order[i] in user_provided_options:
                 raise TypeError(
-                    'Got multiple values for keyword argument \'%s\''
-                    % (option_order[i])
+                    f'Got multiple values for keyword argument \'{option_order[i]}\''
                 )
             user_provided_options[option_order[i]] = arg
 

awscli/botocore/configprovider.py

@@ -560,7 +560,7 @@ def _convert_type(self, value):
         return value
 
     def __repr__(self):
-        return '[%s]' % ', '.join([str(p) for p in self._providers])
+        return '[{}]'.format(', '.join([str(p) for p in self._providers]))
 
 
 class InstanceVarProvider(BaseProvider):
@@ -586,10 +586,7 @@ def provide(self):
         return value
 
     def __repr__(self):
-        return 'InstanceVarProvider(instance_var=%s, session=%s)' % (
-            self._instance_var,
-            self._session,
-        )
+        return f'InstanceVarProvider(instance_var={self._instance_var}, session={self._session})'
 
 
 class ScopedConfigProvider(BaseProvider):
@@ -620,10 +617,7 @@ def provide(self):
         return scoped_config.get(self._config_var_name)
 
     def __repr__(self):
-        return 'ScopedConfigProvider(config_var_name=%s, session=%s)' % (
-            self._config_var_name,
-            self._session,
-        )
+        return f'ScopedConfigProvider(config_var_name={self._config_var_name}, session={self._session})'
 
 
 class EnvironmentProvider(BaseProvider):
@@ -648,7 +642,7 @@ def provide(self):
         return None
 
     def __repr__(self):
-        return 'EnvironmentProvider(name=%s, env=%s)' % (self._name, self._env)
+        return f'EnvironmentProvider(name={self._name}, env={self._env})'
 
 
 class SectionConfigProvider(BaseProvider):
@@ -688,13 +682,8 @@ def provide(self):
 
     def __repr__(self):
         return (
-            'SectionConfigProvider(section_name=%s, '
-            'session=%s, override_providers=%s)'
-            % (
-                self._section_name,
-                self._session,
-                self._override_providers,
-            )
+            f'SectionConfigProvider(section_name={self._section_name}, '
+            f'session={self._session}, override_providers={self._override_providers})'
         )
 
 
@@ -709,7 +698,7 @@ def provide(self):
         return self._value
 
     def __repr__(self):
-        return 'ConstantProvider(value=%s)' % self._value
+        return f'ConstantProvider(value={self._value})'
 
 
 class ConfiguredEndpointProvider(BaseProvider):