[DRAFT] #708 - Make pretty formatter output prettier

jsonschema/cli.py

@@ -1,14 +1,14 @@
+# -*- coding: UTF-8 -*-
 """
 The ``jsonschema`` command line.
 """
 
-from json import JSONDecodeError
-from textwrap import dedent
 import argparse
 import errno
 import json
 import sys
 import traceback
+from json import JSONDecodeError
 
 import attr
 
@@ -66,21 +66,32 @@ def validation_success(self, **kwargs):
         self._stdout.write(self._formatter.validation_success(**kwargs))
 
 
+def _json_formatter(x):
+    return json.dumps(x, indent=4, sort_keys=True)
+
+
 @attr.s
 class _PrettyFormatter(object):
+    _MESSAGE_BAR_CHAR = "═"
+    _MESSAGE_CORNER_CHARS = "╒", "╕"
+    _MESSAGE_FORMAT = "{}══[{}]═══({})"
+    _MESSAGE_MAX_LENGTH = 79
 
-    _ERROR_MSG = dedent(
-        """\
-        ===[{type}]===({path})===
+    def _message_line(self, path, type, header=False):
+        begin_char, end_char = self._MESSAGE_CORNER_CHARS if header \
+            else [self._MESSAGE_BAR_CHAR] * 2
+        return self._MESSAGE_FORMAT.format(begin_char, type, path) \
+            .ljust(self._MESSAGE_MAX_LENGTH - 1, self._MESSAGE_BAR_CHAR) + \
+            end_char
 
-        {body}
-        -----------------------------
-        """,
-    )
-    _SUCCESS_MSG = "===[SUCCESS]===({path})===\n"
+    def _error_msg(self, path, type, body):
+        HEADER = self._message_line(path, type, header=True)
+        FOOTER = "└" + "─" * (self._MESSAGE_MAX_LENGTH - 2) + "┘"
+
+        return "\n".join((HEADER, body, FOOTER, "\n"))
 
     def filenotfound_error(self, path, exc_info):
-        return self._ERROR_MSG.format(
+        return self._error_msg(
             path=path,
             type="FileNotFoundError",
             body="{!r} does not exist.".format(path),
@@ -91,21 +102,21 @@ def parsing_error(self, path, exc_info):
         exc_lines = "".join(
             traceback.format_exception(exc_type, exc_value, exc_traceback),
         )
-        return self._ERROR_MSG.format(
+        return self._error_msg(
             path=path,
             type=exc_type.__name__,
             body=exc_lines,
         )
 
     def validation_error(self, instance_path, error):
-        return self._ERROR_MSG.format(
+        return self._error_msg(
             path=instance_path,
             type=error.__class__.__name__,
-            body=error,
+            body=error._formatted_message(formatter=_json_formatter),
         )
 
     def validation_success(self, instance_path):
-        return self._SUCCESS_MSG.format(path=instance_path)
+        return self._message_line(path=instance_path, type="SUCCESS") + "\n\n"
 
 
 @attr.s

jsonschema/exceptions.py

@@ -1,16 +1,16 @@
 """
 Validation errors, and some surrounding helpers.
 """
-from collections import defaultdict, deque
 import itertools
-import pprint
 import textwrap
+from collections import defaultdict, deque
+from functools import partial
+from pprint import pformat
 
 import attr
 
 from jsonschema import _utils
 
-
 WEAK_MATCHES = frozenset(["anyOf", "oneOf"])
 STRONG_MATCHES = frozenset()
 
@@ -61,14 +61,18 @@ def __repr__(self):
         return "<%s: %r>" % (self.__class__.__name__, self.message)
 
     def __str__(self):
+        return self._formatted_message()
+
+    def _formatted_message(self, formatter=partial(pformat, width=72)):
         essential_for_verbose = (
             self.validator, self.validator_value, self.instance, self.schema,
         )
         if any(m is _unset for m in essential_for_verbose):
             return self.message
 
-        pschema = pprint.pformat(self.schema, width=72)
-        pinstance = pprint.pformat(self.instance, width=72)
+        pschema = formatter(self.schema)
+
+        pinstance = pformat(self.instance, width=72)
         return self.message + textwrap.dedent("""
 
             Failed validating %r in %s%s:
@@ -187,8 +191,8 @@ def __init__(self, type, instance, schema):
         self.schema = schema
 
     def __str__(self):
-        pschema = pprint.pformat(self.schema, width=72)
-        pinstance = pprint.pformat(self.instance, width=72)
+        pschema = pformat(self.schema, width=72)
+        pinstance = pformat(self.instance, width=72)
         return textwrap.dedent("""
             Unknown type %r for validator with schema:
             %s