Use the typing namespace and from __future__ import annotations

Co-authored-by: Thomas Grainger <tagrain@gmail.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
index 6e4c7cef..c386d418 100644
--- a/test/with_dummyserver/test_https.py
+++ b/test/with_dummyserver/test_https.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 import logging
 import os.path
@@ -17,7 +19,6 @@ from test import (
     resolvesLocalhostFQDN,
 )
 from test.conftest import ServerConfig
-from typing import List, Optional
 from unittest import mock
 
 import pytest
@@ -77,12 +78,12 @@ CLIENT_CERT = CLIENT_INTERMEDIATE_PEM
 
 
 class TestHTTPS(HTTPSDummyServerTestCase):
-    tls_protocol_name: Optional[str] = None
+    tls_protocol_name: str | None = None
 
     def tls_protocol_not_default(self) -> bool:
         return self.tls_protocol_name in {"TLSv1", "TLSv1.1"}
 
-    def tls_version(self) -> "ssl.TLSVersion":
+    def tls_version(self) -> ssl.TLSVersion:
         if self.tls_protocol_name is None:
             return pytest.skip("Skipping base test class")
         try:
@@ -735,7 +736,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
 
     def _request_without_resource_warnings(
         self, method: str, url: str
-    ) -> List[warnings.WarningMessage]:
+    ) -> list[warnings.WarningMessage]:
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
             with HTTPSConnectionPool(
@@ -839,7 +840,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
         "ssl_version", [None, ssl.PROTOCOL_TLS, ssl.PROTOCOL_TLS_CLIENT]
     )
     def test_ssl_version_with_protocol_tls_or_client_not_deprecated(
-        self, ssl_version: Optional[int]
+        self, ssl_version: int | None
     ) -> None:
         if self.tls_protocol_name is None:
             pytest.skip("Skipping base test class")
@@ -937,7 +938,7 @@ class TestHTTPS(HTTPSDummyServerTestCase):
 
     @pytest.mark.parametrize("sslkeylogfile", [None, ""])
     def test_sslkeylogfile_empty(
-        self, monkeypatch: pytest.MonkeyPatch, sslkeylogfile: Optional[str]
+        self, monkeypatch: pytest.MonkeyPatch, sslkeylogfile: str | None
     ) -> None:
         # Assert that an HTTPS connection doesn't error out when given
         # no SSLKEYLOGFILE or an empty value (ie 'SSLKEYLOGFILE=')
@@ -1070,7 +1071,7 @@ class TestHTTPS_Hostname:
         except AttributeError:
             pytest.skip("Couldn't set 'SSLContext.hostname_checks_common_name'")
 
-        err: Optional[MaxRetryError]
+        err: MaxRetryError | None
         try:
             with HTTPSConnectionPool(
                 no_san_server.host,