[PATCH] plugin.api.validate: refactor all + any (streamlink#4514)

Billy2011 · Billy2011 · commit e8377aff6434 · 2022-05-08T13:40:17.000+02:00
Turn into SchemaContainer subclasses
diff --git a/src/streamlink/plugin/api/validate.py b/src/streamlink/plugin/api/validate.py
@@ -64,21 +64,27 @@ def _is_re_match(value):
     return _all(_hasattr(value, a) for a in _re_match_attr)
 
 
-class any(tuple):
-    """At least one of the schemas must be valid."""
-    def __new__(cls, *args):
-        return super(any, cls).__new__(cls, args)
+class SchemaContainer(object):
+    def __init__(self, schema):
+        self.schema = schema
 
 
-class all(tuple):
-    """All schemas must be valid."""
-    def __new__(cls, *args):
-        return super(all, cls).__new__(cls, args)
+class any(SchemaContainer):
+    """
+    Collection of schemas where at least one schema must be valid.
+    """
 
+    def __init__(self, *schemas):
+        super(any, self).__init__(schemas)
 
-class SchemaContainer(object):
-    def __init__(self, schema):
-        self.schema = schema
+
+class all(SchemaContainer):
+    """
+    Collection of schemas where every schema must be valid.
+    """
+
+    def __init__(self, *schemas):
+        super(all, self).__init__(schemas)
 
 
 class transform(object):
@@ -390,7 +396,7 @@ def validate(schema, value):
 @validate.register(any)
 def validate_any(schema, value):
     errors = []
-    for subschema in schema:
+    for subschema in schema.schema:
         try:
             return validate(subschema, value)
         except ValueError as err:
@@ -401,8 +407,8 @@ def validate_any(schema, value):
 
 
 @validate.register(all)
-def validate_all(schemas, value):
-    for schema in schemas:
+def validate_all(schema, value):
+    for schema in schema.schema:
         value = validate(schema, value)
 
     return value
