Merge pull request #2312 from VWS-Python/rm-future-annotations

Remove from __future__ import annotations

Author: adamtheturtle

docs/source/conf.py

@@ -62,7 +62,12 @@
     "python": ("https://docs.python.org/3.12", None),
 }
 nitpicky = True
-nitpick_ignore = (("py:class", "BytesIO"), ("py:class", "BufferedRandom"))
+nitpick_ignore = (
+    ("py:class", "BytesIO"),
+    ("py:class", "BufferedRandom"),
+    ("py:class", "_io.BytesIO"),
+    ("py:class", "_io.BufferedRandom"),
+)
 warning_is_error = True
 
 autoclass_content = "both"

src/vws/exceptions/base_exceptions.py

@@ -3,12 +3,7 @@
 Cloud Recognition Web API.
 """
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from .response import Response
+from .response import Response
 
 
 class CloudRecoError(Exception):

src/vws/query.py

@@ -2,12 +2,11 @@
 Tools for interacting with the Vuforia Cloud Recognition Web APIs.
 """
 
-from __future__ import annotations
-
 import datetime
 import json
 from http import HTTPMethod, HTTPStatus
-from typing import TYPE_CHECKING, Any
+from io import BufferedRandom, BytesIO
+from typing import Any
 from urllib.parse import urljoin
 
 import requests
@@ -29,9 +28,6 @@
 from vws.include_target_data import CloudRecoIncludeTargetData
 from vws.reports import QueryResult, TargetData
 
-if TYPE_CHECKING:
-    from io import BufferedRandom, BytesIO
-
 
 def _get_image_data(image: BytesIO | BufferedRandom) -> bytes:
     """Get the data of an image file."""

src/vws/vws.py

@@ -2,14 +2,13 @@
 Tools for interacting with Vuforia APIs.
 """
 
-from __future__ import annotations
-
 import base64
+import io
 import json
 import time
 from datetime import date
 from http import HTTPMethod, HTTPStatus
-from typing import TYPE_CHECKING
+from io import BufferedRandom, BytesIO
 from urllib.parse import urljoin
 
 import requests
@@ -49,10 +48,6 @@
 
 from .exceptions.response import Response
 
-if TYPE_CHECKING:
-    import io
-    from io import BufferedRandom, BytesIO
-
 
 def _get_image_data(image: BytesIO | BufferedRandom) -> bytes:
     """Get the data of an image file."""

tests/conftest.py

@@ -2,21 +2,16 @@
 Configuration, plugins and fixtures for `pytest`.
 """
 
-from __future__ import annotations
-
 import io
-from typing import TYPE_CHECKING
+from collections.abc import Generator
+from pathlib import Path
 
 import pytest
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
 
 from vws import VWS, CloudRecoService
 
-if TYPE_CHECKING:
-    from collections.abc import Generator
-    from pathlib import Path
-
 
 @pytest.fixture(name="_mock_database")
 def mock_database() -> Generator[VuforiaDatabase, None, None]:

tests/test_cloud_reco_exceptions.py

@@ -2,11 +2,9 @@
 Tests for exceptions raised when using the CloudRecoService.
 """
 
-from __future__ import annotations
-
+import io
 import uuid
 from http import HTTPStatus
-from typing import TYPE_CHECKING
 
 import pytest
 from mock_vws import MockVWS
@@ -26,9 +24,6 @@
     RequestEntityTooLargeError,
 )
 
-if TYPE_CHECKING:
-    import io
-
 
 def test_too_many_max_results(
     cloud_reco_client: CloudRecoService,

tests/test_query.py

@@ -2,20 +2,15 @@
 Tests for the ``CloudRecoService`` querying functionality.
 """
 
-from __future__ import annotations
-
+import io
 import uuid
-from typing import TYPE_CHECKING
 
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
 
 from vws import VWS, CloudRecoService
 from vws.include_target_data import CloudRecoIncludeTargetData
 
-if TYPE_CHECKING:
-    import io
-
 
 class TestQuery:
     """

tests/test_vws.py

@@ -2,13 +2,11 @@
 Tests for helper functions for managing a Vuforia database.
 """
 
-from __future__ import annotations
-
 import base64
 import datetime
+import io
 import secrets
 import uuid
-from typing import TYPE_CHECKING
 
 import pytest
 from freezegun import freeze_time
@@ -24,9 +22,6 @@
     TargetSummaryReport,
 )
 
-if TYPE_CHECKING:
-    import io
-
 
 class TestAddTarget:
     """