botocore 1.34.145__py3-none-any.whl → 1.34.147__py3-none-any.whl

botocore/discovery.py

@@ -185,8 +185,7 @@ class EndpointDiscoveryManager:
         if not self._always_discover and not discovery_required:
             # Discovery set to only run on required operations
             logger.debug(
-                'Optional discovery disabled. Skipping discovery for Operation: %s'
-                % operation
+                f'Optional discovery disabled. Skipping discovery for Operation: {operation}'
             )
             return None
 
@@ -228,12 +227,12 @@ class EndpointDiscoveryHandler:
 
     def register(self, events, service_id):
         events.register(
-            'before-parameter-build.%s' % service_id, self.gather_identifiers
+            f'before-parameter-build.{service_id}', self.gather_identifiers
         )
         events.register_first(
-            'request-created.%s' % service_id, self.discover_endpoint
+            f'request-created.{service_id}', self.discover_endpoint
         )
-        events.register('needs-retry.%s' % service_id, self.handle_retries)
+        events.register(f'needs-retry.{service_id}', self.handle_retries)
 
     def gather_identifiers(self, params, model, context, **kwargs):
         endpoint_discovery = model.endpoint_discovery

botocore/docs/bcdoc/docstringparser.py

@@ -83,9 +83,9 @@ class HTMLTree:
 
     def _doc_has_handler(self, tag, is_start):
         if is_start:
-            handler_name = 'start_%s' % tag
+            handler_name = f'start_{tag}'
         else:
-            handler_name = 'end_%s' % tag
+            handler_name = f'end_{tag}'
 
         return hasattr(self.doc.style, handler_name)
 
@@ -226,12 +226,12 @@ class TagNode(StemNode):
             child.collapse_whitespace()
 
     def _write_start(self, doc):
-        handler_name = 'start_%s' % self.tag
+        handler_name = f'start_{self.tag}'
         if hasattr(doc.style, handler_name):
             getattr(doc.style, handler_name)(self.attrs)
 
     def _write_end(self, doc, next_child):
-        handler_name = 'end_%s' % self.tag
+        handler_name = f'end_{self.tag}'
         if hasattr(doc.style, handler_name):
             if handler_name == 'end_a':
                 # We use lookahead to determine if a space is needed after a link node
@@ -248,7 +248,7 @@ class DataNode(Node):
     def __init__(self, data, parent=None):
         super().__init__(parent)
         if not isinstance(data, str):
-            raise ValueError("Expecting string type, %s given." % type(data))
+            raise ValueError(f"Expecting string type, {type(data)} given.")
         self._leading_whitespace = ''
         self._trailing_whitespace = ''
         self._stripped_data = ''

botocore/docs/bcdoc/style.py

@@ -34,7 +34,7 @@ class BaseStyle:
         self._indent = value
 
     def new_paragraph(self):
-        return '\n%s' % self.spaces()
+        return f'\n{self.spaces()}'
 
     def indent(self):
         self._indent += 1
@@ -83,10 +83,10 @@ class ReSTStyle(BaseStyle):
         self.list_depth = 0
 
     def new_paragraph(self):
-        self.doc.write('\n\n%s' % self.spaces())
+        self.doc.write(f'\n\n{self.spaces()}')
 
     def new_line(self):
-        self.doc.write('\n%s' % self.spaces())
+        self.doc.write(f'\n{self.spaces()}')
 
     def _start_inline(self, markup):
         # Insert space between any directly adjacent bold and italic inlines to
@@ -165,11 +165,11 @@ class ReSTStyle(BaseStyle):
 
     def start_p(self, attrs=None):
         if self.do_p:
-            self.doc.write('\n\n%s' % self.spaces())
+            self.doc.write(f'\n\n{self.spaces()}')
 
     def end_p(self):
         if self.do_p:
-            self.doc.write('\n\n%s' % self.spaces())
+            self.doc.write(f'\n\n{self.spaces()}')
 
     def start_code(self, attrs=None):
         self.doc.do_translation = True
@@ -268,14 +268,14 @@ class ReSTStyle(BaseStyle):
                 if ':' in last_write:
                     last_write = last_write.replace(':', r'\:')
                 self.doc.push_write(last_write)
-                self.doc.push_write(' <%s>`__' % self.a_href)
+                self.doc.push_write(f' <{self.a_href}>`__')
             elif last_write == '`':
                 # Look at start_a().  It will do a self.doc.write('`')
                 # which is the start of the link title.  If that is the
                 # case then there was no link text.  We should just
                 # use an inline link.  The syntax of this is
                 # `<http://url>`_
-                self.doc.push_write('`<%s>`__' % self.a_href)
+                self.doc.push_write(f'`<{self.a_href}>`__')
             else:
                 self.doc.push_write(self.a_href)
                 self.doc.hrefs[self.a_href] = self.a_href
@@ -375,9 +375,9 @@ class ReSTStyle(BaseStyle):
             self.li(item)
         else:
             if file_name:
-                self.doc.writeln('  %s' % file_name)
+                self.doc.writeln(f'  {file_name}')
             else:
-                self.doc.writeln('  %s' % item)
+                self.doc.writeln(f'  {item}')
 
     def hidden_toctree(self):
         if self.doc.target == 'html':
@@ -394,11 +394,11 @@ class ReSTStyle(BaseStyle):
         if title is not None:
             self.doc.writeln(title)
         if depth is not None:
-            self.doc.writeln('   :depth: %s' % depth)
+            self.doc.writeln(f'   :depth: {depth}')
 
     def start_sphinx_py_class(self, class_name):
         self.new_paragraph()
-        self.doc.write('.. py:class:: %s' % class_name)
+        self.doc.write(f'.. py:class:: {class_name}')
         self.indent()
         self.new_paragraph()
 
@@ -408,9 +408,9 @@ class ReSTStyle(BaseStyle):
 
     def start_sphinx_py_method(self, method_name, parameters=None):
         self.new_paragraph()
-        content = '.. py:method:: %s' % method_name
+        content = f'.. py:method:: {method_name}'
         if parameters is not None:
-            content += '(%s)' % parameters
+            content += f'({parameters})'
         self.doc.write(content)
         self.indent()
         self.new_paragraph()
@@ -421,7 +421,7 @@ class ReSTStyle(BaseStyle):
 
     def start_sphinx_py_attr(self, attr_name):
         self.new_paragraph()
-        self.doc.write('.. py:attribute:: %s' % attr_name)
+        self.doc.write(f'.. py:attribute:: {attr_name}')
         self.indent()
         self.new_paragraph()
 

botocore/docs/client.py

@@ -120,9 +120,7 @@ class ClientDocumenter:
         section.style.start_codeblock()
         section.style.new_line()
         section.write(
-            'client = session.create_client(\'{service}\')'.format(
-                service=self._service_name
-            )
+            f'client = session.create_client(\'{self._service_name}\')'
         )
         section.style.end_codeblock()
 
@@ -177,14 +175,14 @@ class ClientDocumenter:
             class_name = (
                 f'{self._client_class_name}.Client.exceptions.{error.name}'
             )
-            error_section.style.li(':py:class:`%s`' % class_name)
+            error_section.style.li(f':py:class:`{class_name}`')
 
     def _add_model_driven_method(self, section, method_name):
         service_model = self._client.meta.service_model
         operation_name = self._client.meta.method_to_api_mapping[method_name]
         operation_model = service_model.operation_model(operation_name)
 
-        example_prefix = 'response = client.%s' % method_name
+        example_prefix = f'response = client.{method_name}'
         full_method_name = (
             f"{section.context.get('qualifier', '')}{method_name}"
         )
@@ -344,7 +342,7 @@ class ClientExceptionsDocumenter:
         section.write('...')
         section.style.dedent()
         section.style.new_line()
-        section.write('except client.exceptions.%s as e:' % shape.name)
+        section.write(f'except client.exceptions.{shape.name} as e:')
         section.style.indent()
         section.style.new_line()
         section.write('print(e.response)')

botocore/docs/example.py

@@ -68,7 +68,7 @@ class BaseExampleDocumenter(ShapeDocumenter):
     ):
         if 'enum' in shape.metadata:
             for i, enum in enumerate(shape.metadata['enum']):
-                section.write('\'%s\'' % enum)
+                section.write(f'\'{enum}\'')
                 if i < len(shape.metadata['enum']) - 1:
                     section.write('|')
         else:
@@ -107,7 +107,7 @@ class BaseExampleDocumenter(ShapeDocumenter):
             if exclude and param in exclude:
                 continue
             param_section = section.add_new_section(param)
-            param_section.write('\'%s\': ' % param)
+            param_section.write(f'\'{param}\': ')
             param_shape = input_members[param]
             param_value_section = param_section.add_new_section(
                 'member-value', context={'shape': param_shape.name}

botocore/docs/paginator.py

@@ -223,9 +223,7 @@ def document_paginate_method(
 
     paginate_description = (
         'Creates an iterator that will paginate through responses '
-        'from :py:meth:`{}.Client.{}`.'.format(
-            get_service_module_name(service_model), xform_name(paginator_name)
-        )
+        f'from :py:meth:`{get_service_module_name(service_model)}.Client.{xform_name(paginator_name)}`.'
     )
 
     document_model_driven_method(

botocore/docs/params.py

@@ -163,7 +163,7 @@ class ResponseParamsDocumenter(BaseParamsDocumenter):
         name_section = section.add_new_section('param-name')
         name_section.write('- ')
         if name is not None:
-            name_section.style.bold('%s' % name)
+            name_section.style.bold(f'{name}')
             name_section.write(' ')
         type_section = section.add_new_section('param-type')
         self._document_non_top_level_param_type(type_section, shape)
@@ -186,7 +186,7 @@ class ResponseParamsDocumenter(BaseParamsDocumenter):
                     '    as follows'
                 )
                 tagged_union_members_str = ', '.join(
-                    ['``%s``' % key for key in shape.members.keys()]
+                    [f'``{key}``' for key in shape.members.keys()]
                 )
                 unknown_code_example = (
                     '\'SDK_UNKNOWN_MEMBER\': '
@@ -255,13 +255,13 @@ class RequestParamsDocumenter(BaseParamsDocumenter):
             end_type_section = type_section.add_new_section('end-param-type')
             end_type_section.style.new_line()
             name_section = section.add_new_section('param-name')
-            name_section.write(':param %s: ' % name)
+            name_section.write(f':param {name}: ')
 
         else:
             name_section = section.add_new_section('param-name')
             name_section.write('- ')
             if name is not None:
-                name_section.style.bold('%s' % name)
+                name_section.style.bold(f'{name}')
                 name_section.write(' ')
             type_section = section.add_new_section('param-type')
             self._document_non_top_level_param_type(type_section, shape)
@@ -286,7 +286,7 @@ class RequestParamsDocumenter(BaseParamsDocumenter):
                     '    following top level keys can be set: %s. '
                 )
                 tagged_union_members_str = ', '.join(
-                    ['``%s``' % key for key in shape.members.keys()]
+                    [f'``{key}``' for key in shape.members.keys()]
                 )
                 tagged_union_docs.write(note % (tagged_union_members_str))
             documentation_section.include_doc_string(shape.documentation)

botocore/docs/sharedexample.py

@@ -104,14 +104,14 @@ class SharedExampleDocumenter:
         dict_section = section.add_new_section('dict-value')
         self._start_nested_value(dict_section, '{')
         for key, val in value.items():
-            path.append('.%s' % key)
+            path.append(f'.{key}')
             item_section = dict_section.add_new_section(key)
             item_section.style.new_line()
             item_comment = self._get_comment(path, comments)
             if item_comment:
                 item_section.write(item_comment)
                 item_section.style.new_line()
-            item_section.write("'%s': " % key)
+            item_section.write(f"'{key}': ")
 
             # Shape could be none if there is no output besides ResponseMetadata
             item_shape = None
@@ -131,7 +131,7 @@ class SharedExampleDocumenter:
         param_section = section.add_new_section('param-values')
         self._start_nested_value(param_section, '(')
         for key, val in value.items():
-            path.append('.%s' % key)
+            path.append(f'.{key}')
             item_section = param_section.add_new_section(key)
             item_section.style.new_line()
             item_comment = self._get_comment(path, comments)
@@ -156,7 +156,7 @@ class SharedExampleDocumenter:
         for index, val in enumerate(value):
             item_section = list_section.add_new_section(index)
             item_section.style.new_line()
-            path.append('[%s]' % index)
+            path.append(f'[{index}]')
             item_comment = self._get_comment(path, comments)
             if item_comment:
                 item_section.write(item_comment)
@@ -173,14 +173,14 @@ class SharedExampleDocumenter:
         section.write(f"'{safe_value}',")
 
     def _document_number(self, section, value, path):
-        section.write("%s," % str(value))
+        section.write(f"{str(value)},")
 
     def _document_datetime(self, section, value, path):
         datetime_tuple = parse_timestamp(value).timetuple()
         datetime_str = str(datetime_tuple[0])
         for i in range(1, len(datetime_tuple)):
             datetime_str += ", " + str(datetime_tuple[i])
-        section.write("datetime(%s)," % datetime_str)
+        section.write(f"datetime({datetime_str}),")
 
     def _get_comment(self, path, comments):
         key = re.sub(r'^\.', '', ''.join(path))

botocore/docs/utils.py

@@ -214,8 +214,11 @@ _CONTROLS = {
 }
 # Combines all CONTROLS keys into a big or regular expression
 _ESCAPE_CONTROLS_RE = re.compile('|'.join(map(re.escape, _CONTROLS)))
+
+
 # Based on the match get the appropriate replacement from CONTROLS
-_CONTROLS_MATCH_HANDLER = lambda match: _CONTROLS[match.group(0)]
+def _CONTROLS_MATCH_HANDLER(match):
+    return _CONTROLS[match.group(0)]
 
 
 def escape_controls(value):

botocore/docs/waiter.py

@@ -72,7 +72,7 @@ class WaiterDocumenter:
         waiter_section.style.start_codeblock()
         waiter_section.style.new_line()
         waiter_section.write(
-            'waiter = client.get_waiter(\'%s\')' % xform_name(waiter_name)
+            f'waiter = client.get_waiter(\'{xform_name(waiter_name)}\')'
         )
         waiter_section.style.end_codeblock()
 
@@ -135,7 +135,7 @@ def document_wait_method(
         type_name='integer',
         documentation=(
             '<p>The amount of time in seconds to wait between '
-            'attempts. Default: {}</p>'.format(waiter_model.delay)
+            f'attempts. Default: {waiter_model.delay}</p>'
         ),
     )
 
@@ -144,7 +144,7 @@ def document_wait_method(
         type_name='integer',
         documentation=(
             '<p>The maximum number of attempts to be made. '
-            'Default: {}</p>'.format(waiter_model.max_attempts)
+            f'Default: {waiter_model.max_attempts}</p>'
         ),
     )
 
@@ -161,14 +161,10 @@ def document_wait_method(
     ]
 
     wait_description = (
-        'Polls :py:meth:`{}.Client.{}` every {} '
+        f'Polls :py:meth:`{get_service_module_name(service_model)}.Client.'
+        f'{xform_name(waiter_model.operation)}` every {waiter_model.delay} '
         'seconds until a successful state is reached. An error is '
-        'returned after {} failed checks.'.format(
-            get_service_module_name(service_model),
-            xform_name(waiter_model.operation),
-            waiter_model.delay,
-            waiter_model.max_attempts,
-        )
+        f'returned after {waiter_model.max_attempts} failed checks.'
     )
 
     document_model_driven_method(

botocore/endpoint.py

@@ -128,9 +128,7 @@ class Endpoint:
                 ]
             )
             service_id = operation_model.service_model.service_id.hyphenize()
-            event_name = 'request-created.{service_id}.{op_name}'.format(
-                service_id=service_id, op_name=operation_model.name
-            )
+            event_name = f'request-created.{service_id}.{operation_model.name}'
             self._event_emitter.emit(
                 event_name,
                 request=request,
@@ -224,9 +222,9 @@ class Endpoint:
         ):
             # We want to share num retries, not num attempts.
             total_retries = attempts - 1
-            success_response[1]['ResponseMetadata'][
-                'RetryAttempts'
-            ] = total_retries
+            success_response[1]['ResponseMetadata']['RetryAttempts'] = (
+                total_retries
+            )
         if exception is not None:
             raise exception
         else:
@@ -298,9 +296,9 @@ class Endpoint:
         )
 
         http_response_record_dict = response_dict.copy()
-        http_response_record_dict[
-            'streaming'
-        ] = operation_model.has_streaming_output
+        http_response_record_dict['streaming'] = (
+            operation_model.has_streaming_output
+        )
         history_recorder.record('HTTP_RESPONSE', http_response_record_dict)
 
         protocol = operation_model.metadata['protocol']
@@ -399,7 +397,7 @@ class EndpointCreator:
         if not is_valid_endpoint_url(
             endpoint_url
         ) and not is_valid_ipv6_endpoint_url(endpoint_url):
-            raise ValueError("Invalid endpoint: %s" % endpoint_url)
+            raise ValueError(f"Invalid endpoint: {endpoint_url}")
 
         if proxies is None:
             proxies = self._get_proxies(endpoint_url)

botocore/endpoint_provider.py

@@ -20,7 +20,6 @@ go to any `endpoint-rule-set.json` file in /botocore/data/<service>/<api version
 or you can look at the test files in /tests/unit/data/endpoints/valid-rules/
 """
 
-
 import logging
 import re
 from enum import Enum