Refactorize UATimeoutSafeTransport into TimeoutSafeTransport (#1171)

* Merge UATimeoutSafeTransport and TimeoutSafeTransport

changelog.d/1171.misc.rst

@@ -0,0 +1 @@
+Refactorize UATimeoutSafeTransport into TimeoutSafeTransport.

subliminal/providers/__init__.py

@@ -54,9 +54,17 @@ class TimeoutSafeTransport(SafeTransport):
 
     timeout: float | None
 
-    def __init__(self, timeout: float | None, *args: Any, **kwargs: Any) -> None:
+    def __init__(
+        self,
+        *args: Any,
+        timeout: float | None = None,
+        user_agent: str | None = None,
+        **kwargs: Any,
+    ) -> None:
         super().__init__(*args, **kwargs)
         self.timeout = timeout
+        if user_agent is not None:
+            self.user_agent = user_agent
 
     def make_connection(self, host: Any) -> HTTPSConnection:
         """Make connection to host.

subliminal/providers/opensubtitles.py

@@ -29,25 +29,10 @@
 
 if TYPE_CHECKING:
     from collections.abc import Set
-    from http.client import HTTPConnection
 
 logger = logging.getLogger(__name__)
 
 
-class UATimeoutSafeTransport(TimeoutSafeTransport):
-    """TimeoutSafeTransport with a user agent."""
-
-    def set_user_agent(self, user_agent: str) -> None:
-        """Set user agent."""
-        self._user_agent = user_agent
-
-    def send_headers(self, connection: HTTPConnection, headers: list) -> None:
-        """Send headers."""
-        if self._user_agent:
-            connection.putheader('User-Agent', self.user_agent)
-        super().send_headers(connection, headers)
-
-
 class OpenSubtitlesSubtitle(Subtitle):
     """OpenSubtitles Subtitle."""
 
@@ -202,8 +187,7 @@ def __init__(
         *,
         timeout: int = 10,
     ) -> None:
-        transport = UATimeoutSafeTransport(timeout)
-        transport.set_user_agent('VLSub')
+        transport = TimeoutSafeTransport(timeout=timeout, user_agent='VLSub')
         self.server = ServerProxy(self.server_url, transport)
         if any((username, password)) and not all((username, password)):
             msg = 'Username and password must be specified'