Modernize syntax in various stubs (#7469)

Use `str` and `contextlib.AbstractContextManager` instead of `typing.Text` and `typing.ContextManager`.

Author: AlexWaygood

stubs/boto/boto/__init__.pyi

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Text
+from typing import Any
 
 from .s3.connection import S3Connection
 
@@ -23,7 +23,7 @@ perflog: Any
 def set_file_logger(name, filepath, level: Any = ..., format_string: Any | None = ...): ...
 def set_stream_logger(name, level: Any = ..., format_string: Any | None = ...): ...
 def connect_sqs(aws_access_key_id: Any | None = ..., aws_secret_access_key: Any | None = ..., **kwargs): ...
-def connect_s3(aws_access_key_id: Text | None = ..., aws_secret_access_key: Text | None = ..., **kwargs) -> S3Connection: ...
+def connect_s3(aws_access_key_id: str | None = ..., aws_secret_access_key: str | None = ..., **kwargs) -> S3Connection: ...
 def connect_gs(gs_access_key_id: Any | None = ..., gs_secret_access_key: Any | None = ..., **kwargs): ...
 def connect_ec2(aws_access_key_id: Any | None = ..., aws_secret_access_key: Any | None = ..., **kwargs): ...
 def connect_elb(aws_access_key_id: Any | None = ..., aws_secret_access_key: Any | None = ..., **kwargs): ...

stubs/boto/boto/s3/__init__.pyi

@@ -1,5 +1,3 @@
-from typing import Text
-
 from boto.connection import AWSAuthConnection
 from boto.regioninfo import RegionInfo
 
@@ -8,11 +6,11 @@ from .connection import S3Connection
 class S3RegionInfo(RegionInfo):
     def connect(
         self,
-        name: Text | None = ...,
+        name: str | None = ...,
         endpoint: str | None = ...,
         connection_cls: type[AWSAuthConnection] | None = ...,
         **kw_params,
     ) -> S3Connection: ...
 
 def regions() -> list[S3RegionInfo]: ...
-def connect_to_region(region_name: Text, **kw_params): ...
+def connect_to_region(region_name: str, **kw_params): ...

stubs/boto/boto/s3/acl.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Text
+from typing import Any
 
 from .connection import S3Connection
 from .user import User
@@ -11,38 +11,38 @@ class Policy:
     acl: ACL
     def __init__(self, parent: Any | None = ...) -> None: ...
     owner: User
-    def startElement(self, name: Text, attrs: dict[str, Any], connection: S3Connection) -> None | User | ACL: ...
-    def endElement(self, name: Text, value: Any, connection: S3Connection) -> None: ...
+    def startElement(self, name: str, attrs: dict[str, Any], connection: S3Connection) -> None | User | ACL: ...
+    def endElement(self, name: str, value: Any, connection: S3Connection) -> None: ...
     def to_xml(self) -> str: ...
 
 class ACL:
     policy: Policy
     grants: list[Grant]
     def __init__(self, policy: Policy | None = ...) -> None: ...
     def add_grant(self, grant: Grant) -> None: ...
-    def add_email_grant(self, permission: Text, email_address: Text) -> None: ...
-    def add_user_grant(self, permission: Text, user_id: Text, display_name: Text | None = ...) -> None: ...
+    def add_email_grant(self, permission: str, email_address: str) -> None: ...
+    def add_user_grant(self, permission: str, user_id: str, display_name: str | None = ...) -> None: ...
     def startElement(self, name, attrs, connection): ...
-    def endElement(self, name: Text, value: Any, connection: S3Connection) -> None: ...
+    def endElement(self, name: str, value: Any, connection: S3Connection) -> None: ...
     def to_xml(self) -> str: ...
 
 class Grant:
-    NameSpace: Text
-    permission: Text
-    id: Text
-    display_name: Text
-    uri: Text
-    email_address: Text
-    type: Text
+    NameSpace: str
+    permission: str
+    id: str
+    display_name: str
+    uri: str
+    email_address: str
+    type: str
     def __init__(
         self,
-        permission: Text | None = ...,
-        type: Text | None = ...,
-        id: Text | None = ...,
-        display_name: Text | None = ...,
-        uri: Text | None = ...,
-        email_address: Text | None = ...,
+        permission: str | None = ...,
+        type: str | None = ...,
+        id: str | None = ...,
+        display_name: str | None = ...,
+        uri: str | None = ...,
+        email_address: str | None = ...,
     ) -> None: ...
     def startElement(self, name, attrs, connection): ...
-    def endElement(self, name: Text, value: Any, connection: S3Connection) -> None: ...
+    def endElement(self, name: str, value: Any, connection: S3Connection) -> None: ...
     def to_xml(self) -> str: ...

stubs/boto/boto/s3/bucket.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Text
+from typing import Any
 
 from .bucketlistresultset import BucketListResultSet
 from .connection import S3Connection
@@ -7,7 +7,7 @@ from .key import Key
 class S3WebsiteEndpointTranslate:
     trans_region: dict[str, str]
     @classmethod
-    def translate_region(cls, reg: Text) -> str: ...
+    def translate_region(cls, reg: str) -> str: ...
 
 S3Permissions: list[str]
 
@@ -17,31 +17,31 @@ class Bucket:
     VersioningBody: str
     VersionRE: str
     MFADeleteRE: str
-    name: Text
+    name: str
     connection: S3Connection
     key_class: type[Key]
-    def __init__(self, connection: S3Connection | None = ..., name: Text | None = ..., key_class: type[Key] = ...) -> None: ...
+    def __init__(self, connection: S3Connection | None = ..., name: str | None = ..., key_class: type[Key] = ...) -> None: ...
     def __iter__(self): ...
     def __contains__(self, key_name) -> bool: ...
     def startElement(self, name, attrs, connection): ...
     creation_date: Any
     def endElement(self, name, value, connection): ...
     def set_key_class(self, key_class): ...
-    def lookup(self, key_name, headers: dict[Text, Text] | None = ...): ...
+    def lookup(self, key_name, headers: dict[str, str] | None = ...): ...
     def get_key(
         self,
         key_name,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
         version_id: Any | None = ...,
-        response_headers: dict[Text, Text] | None = ...,
+        response_headers: dict[str, str] | None = ...,
         validate: bool = ...,
     ) -> Key: ...
     def list(
         self,
-        prefix: Text = ...,
-        delimiter: Text = ...,
-        marker: Text = ...,
-        headers: dict[Text, Text] | None = ...,
+        prefix: str = ...,
+        delimiter: str = ...,
+        marker: str = ...,
+        headers: dict[str, str] | None = ...,
         encoding_type: Any | None = ...,
     ) -> BucketListResultSet: ...
     def list_versions(
@@ -50,34 +50,34 @@ class Bucket:
         delimiter: str = ...,
         key_marker: str = ...,
         version_id_marker: str = ...,
-        headers: dict[Text, Text] | None = ...,
-        encoding_type: Text | None = ...,
+        headers: dict[str, str] | None = ...,
+        encoding_type: str | None = ...,
     ) -> BucketListResultSet: ...
     def list_multipart_uploads(
         self,
         key_marker: str = ...,
         upload_id_marker: str = ...,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
         encoding_type: Any | None = ...,
     ): ...
     def validate_kwarg_names(self, kwargs, names): ...
-    def get_all_keys(self, headers: dict[Text, Text] | None = ..., **params): ...
-    def get_all_versions(self, headers: dict[Text, Text] | None = ..., **params): ...
+    def get_all_keys(self, headers: dict[str, str] | None = ..., **params): ...
+    def get_all_versions(self, headers: dict[str, str] | None = ..., **params): ...
     def validate_get_all_versions_params(self, params): ...
-    def get_all_multipart_uploads(self, headers: dict[Text, Text] | None = ..., **params): ...
+    def get_all_multipart_uploads(self, headers: dict[str, str] | None = ..., **params): ...
     def new_key(self, key_name: Any | None = ...): ...
     def generate_url(
         self,
         expires_in,
         method: str = ...,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
         force_http: bool = ...,
-        response_headers: dict[Text, Text] | None = ...,
+        response_headers: dict[str, str] | None = ...,
         expires_in_absolute: bool = ...,
     ): ...
-    def delete_keys(self, keys, quiet: bool = ..., mfa_token: Any | None = ..., headers: dict[Text, Text] | None = ...): ...
+    def delete_keys(self, keys, quiet: bool = ..., mfa_token: Any | None = ..., headers: dict[str, str] | None = ...): ...
     def delete_key(
-        self, key_name, headers: dict[Text, Text] | None = ..., version_id: Any | None = ..., mfa_token: Any | None = ...
+        self, key_name, headers: dict[str, str] | None = ..., version_id: Any | None = ..., mfa_token: Any | None = ...
     ): ...
     def copy_key(
         self,
@@ -89,90 +89,90 @@ class Bucket:
         storage_class: str = ...,
         preserve_acl: bool = ...,
         encrypt_key: bool = ...,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
         query_args: Any | None = ...,
     ): ...
     def set_canned_acl(
-        self, acl_str, key_name: str = ..., headers: dict[Text, Text] | None = ..., version_id: Any | None = ...
+        self, acl_str, key_name: str = ..., headers: dict[str, str] | None = ..., version_id: Any | None = ...
     ): ...
-    def get_xml_acl(self, key_name: str = ..., headers: dict[Text, Text] | None = ..., version_id: Any | None = ...): ...
+    def get_xml_acl(self, key_name: str = ..., headers: dict[str, str] | None = ..., version_id: Any | None = ...): ...
     def set_xml_acl(
         self,
         acl_str,
         key_name: str = ...,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
         version_id: Any | None = ...,
         query_args: str = ...,
     ): ...
-    def set_acl(self, acl_or_str, key_name: str = ..., headers: dict[Text, Text] | None = ..., version_id: Any | None = ...): ...
-    def get_acl(self, key_name: str = ..., headers: dict[Text, Text] | None = ..., version_id: Any | None = ...): ...
+    def set_acl(self, acl_or_str, key_name: str = ..., headers: dict[str, str] | None = ..., version_id: Any | None = ...): ...
+    def get_acl(self, key_name: str = ..., headers: dict[str, str] | None = ..., version_id: Any | None = ...): ...
     def set_subresource(
-        self, subresource, value, key_name: str = ..., headers: dict[Text, Text] | None = ..., version_id: Any | None = ...
+        self, subresource, value, key_name: str = ..., headers: dict[str, str] | None = ..., version_id: Any | None = ...
     ): ...
     def get_subresource(
-        self, subresource, key_name: str = ..., headers: dict[Text, Text] | None = ..., version_id: Any | None = ...
+        self, subresource, key_name: str = ..., headers: dict[str, str] | None = ..., version_id: Any | None = ...
     ): ...
-    def make_public(self, recursive: bool = ..., headers: dict[Text, Text] | None = ...): ...
-    def add_email_grant(self, permission, email_address, recursive: bool = ..., headers: dict[Text, Text] | None = ...): ...
+    def make_public(self, recursive: bool = ..., headers: dict[str, str] | None = ...): ...
+    def add_email_grant(self, permission, email_address, recursive: bool = ..., headers: dict[str, str] | None = ...): ...
     def add_user_grant(
-        self, permission, user_id, recursive: bool = ..., headers: dict[Text, Text] | None = ..., display_name: Any | None = ...
+        self, permission, user_id, recursive: bool = ..., headers: dict[str, str] | None = ..., display_name: Any | None = ...
     ): ...
-    def list_grants(self, headers: dict[Text, Text] | None = ...): ...
+    def list_grants(self, headers: dict[str, str] | None = ...): ...
     def get_location(self): ...
-    def set_xml_logging(self, logging_str, headers: dict[Text, Text] | None = ...): ...
+    def set_xml_logging(self, logging_str, headers: dict[str, str] | None = ...): ...
     def enable_logging(
-        self, target_bucket, target_prefix: str = ..., grants: Any | None = ..., headers: dict[Text, Text] | None = ...
+        self, target_bucket, target_prefix: str = ..., grants: Any | None = ..., headers: dict[str, str] | None = ...
     ): ...
-    def disable_logging(self, headers: dict[Text, Text] | None = ...): ...
-    def get_logging_status(self, headers: dict[Text, Text] | None = ...): ...
-    def set_as_logging_target(self, headers: dict[Text, Text] | None = ...): ...
-    def get_request_payment(self, headers: dict[Text, Text] | None = ...): ...
-    def set_request_payment(self, payer: str = ..., headers: dict[Text, Text] | None = ...): ...
+    def disable_logging(self, headers: dict[str, str] | None = ...): ...
+    def get_logging_status(self, headers: dict[str, str] | None = ...): ...
+    def set_as_logging_target(self, headers: dict[str, str] | None = ...): ...
+    def get_request_payment(self, headers: dict[str, str] | None = ...): ...
+    def set_request_payment(self, payer: str = ..., headers: dict[str, str] | None = ...): ...
     def configure_versioning(
-        self, versioning, mfa_delete: bool = ..., mfa_token: Any | None = ..., headers: dict[Text, Text] | None = ...
+        self, versioning, mfa_delete: bool = ..., mfa_token: Any | None = ..., headers: dict[str, str] | None = ...
     ): ...
-    def get_versioning_status(self, headers: dict[Text, Text] | None = ...): ...
-    def configure_lifecycle(self, lifecycle_config, headers: dict[Text, Text] | None = ...): ...
-    def get_lifecycle_config(self, headers: dict[Text, Text] | None = ...): ...
-    def delete_lifecycle_configuration(self, headers: dict[Text, Text] | None = ...): ...
+    def get_versioning_status(self, headers: dict[str, str] | None = ...): ...
+    def configure_lifecycle(self, lifecycle_config, headers: dict[str, str] | None = ...): ...
+    def get_lifecycle_config(self, headers: dict[str, str] | None = ...): ...
+    def delete_lifecycle_configuration(self, headers: dict[str, str] | None = ...): ...
     def configure_website(
         self,
         suffix: Any | None = ...,
         error_key: Any | None = ...,
         redirect_all_requests_to: Any | None = ...,
         routing_rules: Any | None = ...,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
     ): ...
-    def set_website_configuration(self, config, headers: dict[Text, Text] | None = ...): ...
-    def set_website_configuration_xml(self, xml, headers: dict[Text, Text] | None = ...): ...
-    def get_website_configuration(self, headers: dict[Text, Text] | None = ...): ...
-    def get_website_configuration_obj(self, headers: dict[Text, Text] | None = ...): ...
-    def get_website_configuration_with_xml(self, headers: dict[Text, Text] | None = ...): ...
-    def get_website_configuration_xml(self, headers: dict[Text, Text] | None = ...): ...
-    def delete_website_configuration(self, headers: dict[Text, Text] | None = ...): ...
+    def set_website_configuration(self, config, headers: dict[str, str] | None = ...): ...
+    def set_website_configuration_xml(self, xml, headers: dict[str, str] | None = ...): ...
+    def get_website_configuration(self, headers: dict[str, str] | None = ...): ...
+    def get_website_configuration_obj(self, headers: dict[str, str] | None = ...): ...
+    def get_website_configuration_with_xml(self, headers: dict[str, str] | None = ...): ...
+    def get_website_configuration_xml(self, headers: dict[str, str] | None = ...): ...
+    def delete_website_configuration(self, headers: dict[str, str] | None = ...): ...
     def get_website_endpoint(self): ...
-    def get_policy(self, headers: dict[Text, Text] | None = ...): ...
-    def set_policy(self, policy, headers: dict[Text, Text] | None = ...): ...
-    def delete_policy(self, headers: dict[Text, Text] | None = ...): ...
-    def set_cors_xml(self, cors_xml, headers: dict[Text, Text] | None = ...): ...
-    def set_cors(self, cors_config, headers: dict[Text, Text] | None = ...): ...
-    def get_cors_xml(self, headers: dict[Text, Text] | None = ...): ...
-    def get_cors(self, headers: dict[Text, Text] | None = ...): ...
-    def delete_cors(self, headers: dict[Text, Text] | None = ...): ...
+    def get_policy(self, headers: dict[str, str] | None = ...): ...
+    def set_policy(self, policy, headers: dict[str, str] | None = ...): ...
+    def delete_policy(self, headers: dict[str, str] | None = ...): ...
+    def set_cors_xml(self, cors_xml, headers: dict[str, str] | None = ...): ...
+    def set_cors(self, cors_config, headers: dict[str, str] | None = ...): ...
+    def get_cors_xml(self, headers: dict[str, str] | None = ...): ...
+    def get_cors(self, headers: dict[str, str] | None = ...): ...
+    def delete_cors(self, headers: dict[str, str] | None = ...): ...
     def initiate_multipart_upload(
         self,
         key_name,
-        headers: dict[Text, Text] | None = ...,
+        headers: dict[str, str] | None = ...,
         reduced_redundancy: bool = ...,
         metadata: Any | None = ...,
         encrypt_key: bool = ...,
         policy: Any | None = ...,
     ): ...
-    def complete_multipart_upload(self, key_name, upload_id, xml_body, headers: dict[Text, Text] | None = ...): ...
-    def cancel_multipart_upload(self, key_name, upload_id, headers: dict[Text, Text] | None = ...): ...
-    def delete(self, headers: dict[Text, Text] | None = ...): ...
+    def complete_multipart_upload(self, key_name, upload_id, xml_body, headers: dict[str, str] | None = ...): ...
+    def cancel_multipart_upload(self, key_name, upload_id, headers: dict[str, str] | None = ...): ...
+    def delete(self, headers: dict[str, str] | None = ...): ...
     def get_tags(self): ...
     def get_xml_tags(self): ...
-    def set_xml_tags(self, tag_str, headers: dict[Text, Text] | None = ..., query_args: str = ...): ...
-    def set_tags(self, tags, headers: dict[Text, Text] | None = ...): ...
-    def delete_tags(self, headers: dict[Text, Text] | None = ...): ...
+    def set_xml_tags(self, tag_str, headers: dict[str, str] | None = ..., query_args: str = ...): ...
+    def set_tags(self, tags, headers: dict[str, str] | None = ...): ...
+    def delete_tags(self, headers: dict[str, str] | None = ...): ...