[PATCH] plugin.api.validate: refactor callable (streamlink#4514)

Billy2011 · Billy2011 · commit 537bf3ec473f · 2022-05-09T11:21:41.000+02:00
Remove callable check from the base validate singledispatch function
and register the abc.Callable type instead.

Also fix type validation in the transform schema.
diff --git a/src/streamlink/plugin/api/validate.py b/src/streamlink/plugin/api/validate.py
@@ -15,6 +15,10 @@
 
 """
 
+try:
+    from collections.abc import Callable
+except ImportError:
+    from typing import Callable
 from copy import copy, deepcopy
 from typing import Any, Match, Tuple, Union
 
@@ -349,17 +353,20 @@ def parse_qsd(*args, **kwargs):
 
 @singledispatch
 def validate(schema, value):
-    if callable(schema):
-        if schema(value):
-            return value
-        else:
-            raise ValueError("{0}({1!r}) is not true".format(schema.__name__, value))
-
-    if schema == value:
-        return value
-    else:
+    if schema != value:
         raise ValueError("{0!r} does not equal {1!r}".format(value, schema))
 
+    return value
+
+
+@validate.register(Callable)
+def validate_callable(schema, value):
+    # type: (Callable)
+    if not schema(value):
+        raise ValueError("{0}({1!r}) is not true".format(schema.__name__, value))
+
+    return value
+
 
 @validate.register(any)
 def validate_any(schema, value):
@@ -410,7 +417,7 @@ def validate_getitem(schema, value):
 @validate.register(transform)
 def validate_transform(schema, value):
     # type: (transform)
-    validate(callable, schema.func)
+    validate(Callable, schema.func)
     return schema.func(value, *schema.args, **schema.kwargs)
 
 
