__pretty__ method in pydantic (#59)

* __pretty__ method in pydantic, fix #54

* add tests

Author: samuelcolvin

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
         env_vars: EXTRAS,PYTHON,OS
 
     - name: uninstall extras
-      run: pip uninstall -y multidict numpy
+      run: pip uninstall -y multidict numpy pydantic
 
     - name: test without extras
       run: |

devtools/prettier.py

@@ -95,7 +95,9 @@ def _format(self, value: Any, indent_current: int, indent_first: bool):
         except AttributeError:
             pass
         else:
-            if hasattr(pretty_func, '__self__') and not isinstance(value, MockCall):
+            # `pretty_func.__class__.__name__ == 'method'` should only be true for bound methods,
+            # `hasattr(pretty_func, '__self__')` is more canonical but weirdly is true for unbound cython functions
+            if pretty_func.__class__.__name__ == 'method' and not isinstance(value, MockCall):
                 try:
                     gen = pretty_func(fmt=fmt, skip_exc=SkipPretty)
                     self._render_pretty(gen, indent_current)

tests/requirements.txt

@@ -5,6 +5,7 @@ isort==4.3.17
 pycodestyle==2.6.0
 pyflakes==2.2.0
 Pygments==2.6.1
+pydantic==1.5.1
 pytest==5.4.2
 pytest-cov==2.8.1
 pytest-mock==3.1.0

tests/test_custom_pretty.py

@@ -1,5 +1,12 @@
+import pytest
+
 from devtools import pformat
 
+try:
+    import pydantic
+except ImportError:
+    pydantic = None
+
 
 def test_simple():
     class CustomCls:
@@ -62,4 +69,13 @@ def __pretty__(self, fmt, **kwargs):
             yield 'xxx'
 
     assert pformat(Foobar()) == 'xxx'
-    assert pformat(Foobar).endswith(".test_pretty_class.<locals>.Foobar'>")
+    assert pformat(Foobar) == "<class 'tests.test_custom_pretty.test_pretty_class.<locals>.Foobar'>"
+
+
+@pytest.mark.skipif(pydantic is None, reason='numpy not installed')
+def test_pydantic_pretty():
+    class MyModel(pydantic.BaseModel):
+        foobar: int = 1
+
+    assert pformat(MyModel()) == 'MyModel(\n    foobar=1,\n)'
+    assert pformat(MyModel) == "<class 'tests.test_custom_pretty.test_pydantic_pretty.<locals>.MyModel'>"