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

Billy2011 · Billy2011 · commit b6be5dc6baf4 · 2022-05-08T20:21:19.000+02:00
Inherit from the all-schema directly to avoid having an unnecessary
singledispatch type definition.
diff --git a/src/streamlink/plugin/api/validate.py b/src/streamlink/plugin/api/validate.py
@@ -77,7 +77,7 @@ def __init__(self, *schemas):
         super(all, self).__init__(schemas)
 
 
-class get:
+class get(object):
     """
     Get item from input.
 
@@ -128,7 +128,7 @@ def __init__(self, *keys, **kw):
         self.seq = kw.get("seq", tuple)
 
 
-class xml_element:
+class xml_element(object):
     """
     Validate an XML element.
     """
@@ -563,19 +563,13 @@ def validate_unions(schema, value):
     return validate_union(schema.schema, value)
 
 
-class Schema(object):
-    """Wraps a validator schema into a object."""
-
-    def __init__(self, *schemas):
-        self.schema = all(*schemas)
+class Schema(all):
+    """
+    Wrapper class for :class:`all` with a validate method which raises :class:`PluginError` by default on error.
+    """
 
     def validate(self, value, name="result", exception=PluginError):
         try:
-            return validate(self.schema, value)
+            return validate(self, value)
         except ValueError as err:
             raise exception("Unable to validate {0}: {1}".format(name, err))
-
-
-@validate.register(Schema)
-def validate_schema(schema, value):
-    return schema.validate(value, exception=ValueError)
