Add checker instance to type checking functions

bsmithers · bsmithers · commit 30bec1a0100d · 2017-12-11T13:48:31.000Z
Improves composability, esp for custom types.
diff --git a/jsonschema/_types.py b/jsonschema/_types.py
@@ -7,41 +7,41 @@
 from jsonschema.exceptions import UndefinedTypeCheck
 
 
-def is_array(instance):
+def is_array(checker, instance):
     return isinstance(instance, list)
 
 
-def is_bool(instance):
+def is_bool(checker, instance):
     return isinstance(instance, bool)
 
 
-def is_integer(instance):
+def is_integer(checker, instance):
     # bool inherits from int, so ensure bools aren't reported as ints
     if isinstance(instance, bool):
         return False
     return isinstance(instance, int_types)
 
 
-def is_null(instance):
+def is_null(checker, instance):
     return instance is None
 
 
-def is_number(instance):
+def is_number(checker, instance):
     # bool inherits from int, so ensure bools aren't reported as ints
     if isinstance(instance, bool):
         return False
     return isinstance(instance, numbers.Number)
 
 
-def is_object(instance):
+def is_object(checker, instance):
     return isinstance(instance, dict)
 
 
-def is_string(instance):
+def is_string(checker, instance):
     return isinstance(instance, str_types)
 
 
-def is_any(instance):
+def is_any(checker, instance):
     return True
 
 
@@ -90,7 +90,7 @@ def is_type(self, instance, type):
                 if type is unknown to this object.
         """
         try:
-            return self._type_checkers[type](instance)
+            return self._type_checkers[type](self, instance)
         except KeyError:
             raise UndefinedTypeCheck
 
diff --git a/jsonschema/tests/test_types.py b/jsonschema/tests/test_types.py
@@ -11,11 +11,11 @@
 from jsonschema.validators import Draft4Validator, extend
 
 
-def is_int_or_string_int(instance):
+def is_int_or_string_int(checker, instance):
     if Draft4Validator.TYPE_CHECKER.is_type(instance, "integer"):
         return True
 
-    if Draft4Validator.TYPE_CHECKER.is_type(instance, "string"):
+    if checker.is_type(instance, "string"):
         try:
             int(instance)
             return True
@@ -32,7 +32,7 @@ def is_namedtuple(instance):
     return False
 
 
-def is_object_or_named_tuple(instance):
+def is_object_or_named_tuple(checker, instance):
     if Draft4Validator.TYPE_CHECKER.is_type(instance, "object"):
         return True
 
diff --git a/jsonschema/validators.py b/jsonschema/validators.py
@@ -83,7 +83,7 @@ def _generate_legacy_type_checks(types=()):
     def gen_type_check(pytypes):
         pytypes = _utils.flatten(pytypes)
 
-        def type_check(instance):
+        def type_check(checker, instance):
             if isinstance(instance, bool):
                 if bool not in pytypes:
                     return False
