Adopt new version Python typing syntax

Author: chezou

pyproject.toml

@@ -31,7 +31,6 @@ dependencies = [
   "python-dateutil",
   "msgpack>=0.6.2",
   "urllib3",
-  "typing-extensions>=4.0.0",
 ]
 
 [project.optional-dependencies]

tdclient/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import datetime
 import time
 from typing import Any

tdclient/api.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import contextlib
 import csv
 import email.utils

tdclient/bulk_import_api.py

@@ -1,22 +1,16 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import collections
 import contextlib
 import gzip
 import io
 import os
 from collections.abc import Iterator
-from typing import TYPE_CHECKING, Any
+from contextlib import AbstractContextManager
+from typing import IO, Any
 
 import msgpack
-
-if TYPE_CHECKING:
-    from contextlib import AbstractContextManager
-    from typing import IO
-
-    import urllib3
+import urllib3
 
 from tdclient.types import BulkImportParams, BytesOrStream, DataFormat, FileLike
 from tdclient.util import create_url

tdclient/bulk_import_model.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import time
 from collections.abc import Callable, Iterator
 from typing import TYPE_CHECKING, Any
@@ -23,7 +21,7 @@ class BulkImport(Model):
     STATUS_COMMITTING = "committing"
     STATUS_COMMITTED = "committed"
 
-    def __init__(self, client: Client, **kwargs: Any) -> None:
+    def __init__(self, client: "Client", **kwargs: Any) -> None:
         super().__init__(client)
         self._feed(kwargs)
 
@@ -116,7 +114,7 @@ def perform(
         wait_interval: int = 5,
         wait_callback: Callable[[], None] | None = None,
         timeout: float | None = None,
-    ) -> Job:
+    ) -> "Job":
         """Perform bulk import
 
         Args:

tdclient/client.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import datetime
 import json
 from collections.abc import Iterator
@@ -27,7 +25,7 @@ class Client:
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         self._api = api.API(*args, **kwargs)
 
-    def __enter__(self) -> Client:
+    def __enter__(self) -> "Client":
         return self
 
     def __exit__(

tdclient/connection.py

@@ -1,16 +1,13 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 from collections.abc import Callable
+from types import TracebackType
 from typing import TYPE_CHECKING, Any
 
 from tdclient import api, cursor, errors
 from tdclient.types import Priority
 
 if TYPE_CHECKING:
-    from types import TracebackType
-
     from tdclient.cursor import Cursor
 
 
@@ -23,7 +20,7 @@ def __init__(
         priority: Priority | None = None,
         retry_limit: int | None = None,
         wait_interval: int | None = None,
-        wait_callback: Callable[[Cursor], None] | None = None,
+        wait_callback: Callable[["Cursor"], None] | None = None,
         **kwargs: Any,
     ) -> None:
         cursor_kwargs = dict()
@@ -44,7 +41,7 @@ def __init__(
         self._api = api.API(**kwargs)
         self._cursor_kwargs = cursor_kwargs
 
-    def __enter__(self) -> Connection:
+    def __enter__(self) -> "Connection":
         return self
 
     def __exit__(
@@ -68,5 +65,5 @@ def commit(self) -> None:
     def rollback(self) -> None:
         raise errors.NotSupportedError
 
-    def cursor(self) -> Cursor:
+    def cursor(self) -> "Cursor":
         return cursor.Cursor(self._api, **self._cursor_kwargs)

tdclient/connector_api.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import json
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from contextlib import AbstractContextManager
+from contextlib import AbstractContextManager
+from typing import Any
 
-    import urllib3
+import urllib3
 
 from tdclient.util import create_url, normalize_connector_config
 

tdclient/cursor.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import time
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any
@@ -15,9 +13,9 @@
 class Cursor:
     def __init__(
         self,
-        api: API,
+        api: "API",
         wait_interval: int = 5,
-        wait_callback: Callable[[Cursor], None] | None = None,
+        wait_callback: Callable[["Cursor"], None] | None = None,
         **kwargs: Any,
     ) -> None:
         self._api = api
@@ -31,7 +29,7 @@ def __init__(
         self.wait_callback = wait_callback
 
     @property
-    def api(self) -> API:
+    def api(self) -> "API":
         return self._api
 
     @property

tdclient/database_api.py

@@ -1,13 +1,9 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
+from contextlib import AbstractContextManager
+from typing import Any
 
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from contextlib import AbstractContextManager
-
-    import urllib3
+import urllib3
 
 from tdclient.util import create_url, get_or_else, parse_date