botocore 1.40.0__py3-none-any.whl → 1.40.2__py3-none-any.whl

botocore/session.py

@@ -979,8 +979,9 @@ class Session:
                 aws_session_token, aws_account_id
             ):
                 logger.debug(
-                    f"Ignoring the following credential-related values which were set without "
-                    f"an access key id and secret key on the session or client: {ignored_credentials}"
+                    "Ignoring the following credential-related values which were set without "
+                    "an access key id and secret key on the session or client: %s",
+                    ignored_credentials,
                 )
             credentials = self.get_credentials()
         auth_token = self.get_auth_token()
@@ -1178,7 +1179,7 @@ class Session:
                 client_plugins[name] = module
             except ValueError:
                 logger.warning(
-                    f"Invalid plugin format: {plugin}. Expected 'name=module'"
+                    "Invalid plugin format: %s. Expected 'name=module'", plugin
                 )
 
         if client_plugins:

botocore/signers.py

@@ -18,7 +18,7 @@ import weakref
 import botocore
 import botocore.auth
 from botocore.awsrequest import create_request_object, prepare_request_dict
-from botocore.compat import OrderedDict
+from botocore.compat import OrderedDict, get_current_datetime
 from botocore.exceptions import (
     ParamValidationError,
     UnknownClientMethodError,
@@ -728,7 +728,7 @@ class S3PostPresigner:
         policy = {}
 
         # Create an expiration date for the policy
-        datetime_now = datetime.datetime.utcnow()
+        datetime_now = get_current_datetime()
         expire_date = datetime_now + datetime.timedelta(seconds=expires_in)
         policy['expiration'] = expire_date.strftime(botocore.auth.ISO8601)
 

botocore/tokens.py

@@ -297,7 +297,7 @@ class SSOTokenProvider:
 
         expiry = dateutil.parser.parse(token["registrationExpiresAt"])
         if total_seconds(expiry - self._now()) <= 0:
-            logger.info(f"SSO token registration expired at {expiry}")
+            logger.info("SSO token registration expired at %s", expiry)
             return None
 
         try:
@@ -309,10 +309,10 @@ class SSOTokenProvider:
     def _refresher(self):
         start_url = self._sso_config["sso_start_url"]
         session_name = self._sso_config["session_name"]
-        logger.info(f"Loading cached SSO token for {session_name}")
+        logger.info("Loading cached SSO token for %s", session_name)
         token_dict = self._token_loader(start_url, session_name=session_name)
         expiration = dateutil.parser.parse(token_dict["expiresAt"])
-        logger.debug(f"Cached SSO token expires at {expiration}")
+        logger.debug("Cached SSO token expires at %s", expiration)
 
         remaining = total_seconds(expiration - self._now())
         if remaining < self._REFRESH_WINDOW:

botocore/useragent.py

@@ -195,10 +195,13 @@ class UserAgentComponent(NamedTuple):
 
         if string == '':
             logger.debug(
-                f"User agent component `{orig}` could not be truncated to "
-                f"`{max_size}` bytes with delimiter "
-                f"`{delimiter}` without losing all contents. "
-                f"Value will be omitted from user agent string."
+                "User agent component `%s` could not be truncated to "
+                "`%s` bytes with delimiter "
+                "`%s` without losing all contents. "
+                "Value will be omitted from user agent string.",
+                orig,
+                max_size,
+                delimiter,
             )
         return string
 

botocore/utils.py

@@ -53,6 +53,7 @@ from botocore.compat import (
     UNSAFE_URL_CHARS,
     ZONE_ID_PAT,  # noqa: F401
     OrderedDict,
+    get_current_datetime,
     get_md5,
     get_tzinfo_options,
     json,
@@ -453,7 +454,7 @@ class IMDSFetcher:
         else:
             chosen_base_url = METADATA_BASE_URL
 
-        logger.debug(f"IMDS ENDPOINT: {chosen_base_url}")
+        logger.debug("IMDS ENDPOINT: %s", chosen_base_url)
         if not is_valid_uri(chosen_base_url):
             raise InvalidIMDSEndpointError(endpoint=chosen_base_url)
 
@@ -693,7 +694,7 @@ class InstanceMetadataFetcher(IMDSFetcher):
             )
             jitter = random.randint(120, 600)  # Between 2 to 10 minutes
             refresh_interval_with_jitter = refresh_interval + jitter
-            current_time = datetime.datetime.utcnow()
+            current_time = get_current_datetime()
             refresh_offset = datetime.timedelta(
                 seconds=refresh_interval_with_jitter
             )
@@ -704,14 +705,15 @@ class InstanceMetadataFetcher(IMDSFetcher):
                     "%Y-%m-%dT%H:%M:%SZ"
                 )
                 logger.info(
-                    f"Attempting credential expiration extension due to a "
-                    f"credential service availability issue. A refresh of "
-                    f"these credentials will be attempted again within "
-                    f"the next {refresh_interval_with_jitter / 60:.0f} minutes."
+                    "Attempting credential expiration extension due to a "
+                    "credential service availability issue. A refresh of "
+                    "these credentials will be attempted again within "
+                    "the next %.0f minutes.",
+                    refresh_interval_with_jitter / 60,
                 )
         except ValueError:
             logger.debug(
-                f"Unable to parse expiry_time in {credentials['expiry_time']}"
+                "Unable to parse expiry_time in %s", credentials['expiry_time']
             )
 
 
@@ -1572,7 +1574,9 @@ def _get_new_endpoint(original_endpoint, new_endpoint, use_new_scheme=True):
         '',
     )
     final_endpoint = urlunsplit(final_endpoint_components)
-    logger.debug(f'Updating URI from {original_endpoint} to {final_endpoint}')
+    logger.debug(
+        'Updating URI from %s to %s', original_endpoint, final_endpoint
+    )
     return final_endpoint
 
 
@@ -1823,16 +1827,21 @@ class S3RegionRedirectorv2:
 
         if new_region is None:
             logger.debug(
-                f"S3 client configured for region {client_region} but the "
-                f"bucket {bucket} is not in that region and the proper region "
-                "could not be automatically determined."
+                "S3 client configured for region %s but the "
+                "bucket %s is not in that region and the proper region "
+                "could not be automatically determined.",
+                client_region,
+                bucket,
             )
             return
 
         logger.debug(
-            f"S3 client configured for region {client_region} but the bucket {bucket} "
-            f"is in region {new_region}; Please configure the proper region to "
-            f"avoid multiple unnecessary redirects and signing attempts."
+            "S3 client configured for region %s but the bucket %s "
+            "is in region %s; Please configure the proper region to "
+            "avoid multiple unnecessary redirects and signing attempts.",
+            client_region,
+            bucket,
+            new_region,
         )
         # Adding the new region to _cache will make construct_endpoint() to
         # use the new region as value for the AWS::Region builtin parameter.
@@ -2021,16 +2030,21 @@ class S3RegionRedirector:
 
         if new_region is None:
             logger.debug(
-                f"S3 client configured for region {client_region} but the bucket {bucket} is not "
+                "S3 client configured for region %s but the bucket %s is not "
                 "in that region and the proper region could not be "
-                "automatically determined."
+                "automatically determined.",
+                client_region,
+                bucket,
             )
             return
 
         logger.debug(
-            f"S3 client configured for region {client_region} but the bucket {bucket} is in region"
-            f" {new_region}; Please configure the proper region to avoid multiple "
-            "unnecessary redirects and signing attempts."
+            "S3 client configured for region %s but the bucket %s is in region"
+            " %s; Please configure the proper region to avoid multiple "
+            "unnecessary redirects and signing attempts.",
+            client_region,
+            bucket,
+            new_region,
         )
         endpoint = self._endpoint_resolver.resolve('s3', new_region)
         endpoint = endpoint['endpoint_url']
@@ -2449,7 +2463,7 @@ class S3EndpointSetter:
             )
         )
         logger.debug(
-            f'Updating URI from {request.url} to {accesspoint_endpoint}'
+            'Updating URI from %s to %s', request.url, accesspoint_endpoint
         )
         request.url = accesspoint_endpoint
 
@@ -2749,7 +2763,7 @@ class S3ControlEndpointSetter:
             )
         )
         logger.debug(
-            f'Updating URI from {request.url} to {arn_details_endpoint}'
+            'Updating URI from %s to %s', request.url, arn_details_endpoint
         )
         request.url = arn_details_endpoint
 
@@ -3381,7 +3395,7 @@ class SSOTokenLoader:
 
     def __call__(self, start_url, session_name=None):
         cache_key = self._generate_cache_key(start_url, session_name)
-        logger.debug(f'Checking for cached token at: {cache_key}')
+        logger.debug('Checking for cached token at: %s', cache_key)
         if cache_key not in self._cache:
             name = start_url
             if session_name is not None:
@@ -3417,7 +3431,9 @@ class EventbridgeSignerSetter:
     def set_endpoint_url(self, params, context, **kwargs):
         if 'eventbridge_endpoint' in context:
             endpoint = context['eventbridge_endpoint']
-            logger.debug(f"Rewriting URL from {params['url']} to {endpoint}")
+            logger.debug(
+                "Rewriting URL from %s to %s", params['url'], endpoint
+            )
             params['url'] = endpoint
 
     def check_for_global_endpoint(self, params, context, **kwargs):
@@ -3561,7 +3577,7 @@ class JSONFileCache:
                 f"Value cannot be cached, must be JSON serializable: {value}"
             )
         if not os.path.isdir(self._working_dir):
-            os.makedirs(self._working_dir)
+            os.makedirs(self._working_dir, exist_ok=True)
         with os.fdopen(
             os.open(full_key, os.O_WRONLY | os.O_CREAT, 0o600), 'w'
         ) as f:

{botocore-1.40.0.dist-info → botocore-1.40.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: botocore
-Version: 1.40.0
+Version: 1.40.2
 Summary: Low-level, data-driven core of boto 3.
 Home-page: https://github.com/boto/botocore
 Author: Amazon Web Services