partially revert a9674a0

test/test_networking.py

@@ -951,8 +951,8 @@ def __init__(self, request):
 
 class FakeRH(RequestHandler):
 
-    def validate(self, request):
-        assert isinstance(request, Request)
+    def _validate(self, request):
+        return
 
     def _send(self, request: Request):
         if request.url.startswith('ssl://'):

yt_dlp/networking/common.py

@@ -21,7 +21,6 @@
     TransportError,
     UnsupportedRequest,
 )
-from ..compat import types
 from ..utils import (
     bug_reports_message,
     classproperty,
@@ -140,7 +139,7 @@ class RequestHandler(abc.ABC):
     If a Request is not supported by the handler, an UnsupportedRequest
     should be raised with a reason.
 
-    By default, some checks are done on the request in validate() based on the following class variables:
+    By default, some checks are done on the request in _validate() based on the following class variables:
     - `_SUPPORTED_URL_SCHEMES`: a tuple of supported url schemes.
         Any Request with an url scheme not in this list will raise an UnsupportedRequest.
 
@@ -272,13 +271,10 @@ def _check_proxies(self, proxies):
 
     def _check_extensions(self, extensions):
         """Check extensions for unsupported extensions. Subclasses should extend this."""
-        assert isinstance(extensions.get('cookiejar'), (CookieJar, types.NoneType))
-        assert isinstance(extensions.get('timeout'), (float, int, types.NoneType))
+        assert isinstance(extensions.get('cookiejar'), (CookieJar, type(None)))
+        assert isinstance(extensions.get('timeout'), (float, int, type(None)))
 
-    @wrap_request_errors
-    def validate(self, request: Request):
-        if not isinstance(request, Request):
-            raise TypeError('Expected an instance of Request')
+    def _validate(self, request):
         self._check_url_scheme(request)
         self._check_proxies(request.proxies or self.proxies)
         extensions = request.extensions.copy()
@@ -287,6 +283,12 @@ def validate(self, request: Request):
             # TODO: add support for optional extensions
             raise UnsupportedRequest(f'Unsupported extensions: {", ".join(extensions.keys())}')
 
+    @wrap_request_errors
+    def validate(self, request: Request):
+        if not isinstance(request, Request):
+            raise TypeError('Expected an instance of Request')
+        self._validate(request)
+
     @wrap_request_errors
     def send(self, request: Request) -> Response:
         if not isinstance(request, Request):