add pprint as values dumper

Author: mr-mixas

nested_diff/cli.py

@@ -450,6 +450,44 @@ def decode(self, data):
         return out
 
 
+class PprintDumper(Dumper):
+    """Pprint dumper."""
+
+    def __init__(self, **kwargs):
+        """Initialize dumper."""
+        super().__init__()
+
+        import pprint
+
+        self.codec = pprint.PrettyPrinter(**self.get_opts(kwargs))
+
+    def encode(self, data):
+        """Encode data as pprint does."""
+        return self.codec.pformat(data)
+
+    @staticmethod
+    def get_opts(opts):
+        """Extend options by default values.
+
+        Args:
+            opts: Kwargs for pprint.PrettyPrinter as dict.
+
+        Returns:
+            Options extended by default values.
+
+        """
+        defaults = {
+            'indent': 1,
+            'width': 80,
+            'depth': None,
+            'compact': True,
+            'sort_dicts': True,
+        }
+        defaults.update(opts)
+
+        return defaults
+
+
 class TomlDumper(Dumper):
     """TOML dumper."""
 

nested_diff/diff_tool.py

@@ -148,7 +148,7 @@ def get_optional_args_parser(self):
         )
         parser.add_argument(
             '--values',
-            choices=('repr', 'none', 'json', 'yaml'),
+            choices=('repr', 'none', 'json', 'pprint', 'yaml'),
             default='repr',
             help='values format; "none" means no values printed, "repr" is a '
             'python representation of the object, rest are themselves; default'
@@ -332,6 +332,8 @@ def __init__(self, *args, **kwargs):
 
                 if values == 'json':
                     self.__val_encoder = nested_diff.cli.JsonDumper(indent=2)
+                elif values == 'pprint':
+                    self.__val_encoder = nested_diff.cli.PprintDumper()
                 elif values == 'yaml':
                     self.__val_encoder = nested_diff.cli.YamlDumper(
                         explicit_start=False,

tests/cli/test_diff_tool.py

@@ -350,7 +350,6 @@ def test_term_ofmt(capsys, expected, rpath):
     assert captured.out == expected
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason='different keys order')
 def test_toml_fmt(capsys, expected, rpath):
     exit_code = nested_diff.diff_tool.App(
         args=(
@@ -714,6 +713,24 @@ def test_values_json(capsys, expected, rpath):
     assert captured.out == expected
 
 
+@pytest.mark.skipif(sys.version_info < (3, 8), reason="no 'sort_dicts' option")
+def test_values_pprint(capsys, expected, rpath):
+    exit_code = nested_diff.diff_tool.App(
+        args=(
+            rpath('shared.a.ini'),
+            rpath('shared.b.ini'),
+            '--values',
+            'pprint',
+        ),
+    ).run()
+
+    captured = capsys.readouterr()
+    assert captured.err == ''
+    assert exit_code == 1
+
+    assert captured.out == expected
+
+
 def test_values_yaml(capsys, expected, rpath):
     exit_code = nested_diff.diff_tool.App(
         args=(

tests/cli/test_diff_tool.test_values_pprint.exp

@@ -0,0 +1,6 @@
+  {'one'}
+    {'ein'}
+-     '1'
++     'uno'
+- {'two'}
+-   {'zwei': '2'}