Make utils.indent exit stage left.

Author: Julian

jsonschema/_utils.py

@@ -55,14 +55,6 @@ def load_schema(name):
     return json.loads(data.decode("utf-8"))
 
 
-def indent(string, times=1):
-    """
-    A dumb version of `textwrap.indent` from Python 3.3.
-    """
-
-    return "\n".join(" " * (4 * times) + line for line in string.splitlines())
-
-
 def format_as_index(indices):
     """
     Construct a single string containing indexing operations for the indices.

jsonschema/exceptions.py

@@ -80,10 +80,10 @@ def __str__(self):
             self.validator,
             self._word_for_schema_in_error_message,
             _utils.format_as_index(list(self.relative_schema_path)[:-1]),
-            _utils.indent(pschema),
+            textwrap.indent(pschema, "    "),
             self._word_for_instance_in_error_message,
             _utils.format_as_index(self.relative_path),
-            _utils.indent(pinstance),
+            textwrap.indent(pinstance, "    "),
         )
 
     @classmethod
@@ -195,7 +195,11 @@ def __str__(self):
             While checking instance:
             %s
             """.rstrip()
-        ) % (self.type, _utils.indent(pschema), _utils.indent(pinstance))
+        ) % (
+            self.type,
+            textwrap.indent(pschema, "    "),
+            textwrap.indent(pinstance, "    "),
+        )
 
 
 class FormatError(Exception):

jsonschema/tests/test_types.py

@@ -10,7 +10,7 @@
 
 from jsonschema import ValidationError, _validators
 from jsonschema._types import TypeChecker
-from jsonschema.exceptions import UndefinedTypeCheck
+from jsonschema.exceptions import UndefinedTypeCheck, UnknownType
 from jsonschema.validators import Draft4Validator, extend