Improve the error message informing the type that it got it

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/ambv/black
-    rev: 19.3b0
+    rev: 18.6b4
     hooks:
       - id: black
         language_version: python3.7

docs/api.rst

@@ -397,7 +397,7 @@ Validators
         >>> C("not a callable")
         Traceback (most recent call last):
             ...
-        TypeError: 'x' must be callable
+        TypeError: 'x' must be callable (got 'not a callable' that is a <class 'str'>).
 
 
 .. autofunction:: attr.validators.deep_iterable

src/attr/exceptions.py

@@ -55,3 +55,20 @@ class PythonTooOldError(RuntimeError):
 
     .. versionadded:: 18.2.0
     """
+
+
+class NotCallableError(TypeError):
+    """
+    A ``attr.ib()`` requiring a callable has been set with a value
+    that is not callable.
+
+    .. versionadded:: 19.2.0
+    """
+
+    def __init__(self, message, value):
+        super().__init__(message, value)
+        self.message = message
+        self.value = value
+
+    def __str__(self):
+        return str(self.message)

src/attr/validators.py

@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function
 
 from ._make import _AndValidator, and_, attrib, attrs
+from .exceptions import NotCallableError
 
 
 __all__ = [
@@ -186,21 +187,32 @@ def __call__(self, inst, attr, value):
         We use a callable class to be able to change the ``__repr__``.
         """
         if not callable(value):
-            raise TypeError("'{name}' must be callable".format(name=attr.name))
+            message = (
+                "'{name}' must be callable "
+                "(got {value!r} that is a {actual!r})."
+            )
+            raise NotCallableError(
+                message=message.format(
+                    name=attr.name, value=value, actual=value.__class__
+                ),
+                value=value,
+            )
 
     def __repr__(self):
         return "<is_callable validator>"
 
 
 def is_callable():
     """
-    A validator that raises a :class:`TypeError` if the initializer is called
-    with a value for this particular attribute that is not callable.
+    A validator that raises a :class:`attr.exceptions.NotCallableError`
+    if the initializer is called with a value for this particular attribute
+    that is not callable.
 
     .. versionadded:: 19.1.0
 
-    :raises TypeError: With a human readable error message containing the
-        attribute (of type :class:`attr.Attribute`) name.
+    :raises `attr.exceptions.NotCallableError`: With a human readable error
+        message containing the attribute (:class:`attr.Attribute`) name,
+        and the value it got.
     """
     return _IsCallableValidator()
 

tests/test_validators.py

@@ -354,8 +354,14 @@ def test_noncallable_validators(
         """
         with pytest.raises(TypeError) as e:
             deep_iterable(member_validator, iterable_validator)
-
-        e.match(r"\w* must be callable")
+        value = 42
+        message = "must be callable (got {value} that is a {type_}).".format(
+            value=value, type_=value.__class__
+        )
+        assert message in e.value.args[0]
+        assert value == e.value.args[1]
+        assert message in e.value.message
+        assert value == e.value.value
 
     def test_fail_invalid_member(self):
         """
@@ -466,7 +472,14 @@ def test_noncallable_validators(
         with pytest.raises(TypeError) as e:
             deep_mapping(key_validator, value_validator, mapping_validator)
 
-        e.match(r"\w* must be callable")
+        value = 42
+        message = "must be callable (got {value} that is a {type_}).".format(
+            value=value, type_=value.__class__
+        )
+        assert message in e.value.args[0]
+        assert value == e.value.args[1]
+        assert message in e.value.message
+        assert value == e.value.value
 
     def test_fail_invalid_mapping(self):
         """
@@ -550,7 +563,13 @@ def test_fail(self):
         with pytest.raises(TypeError) as e:
             v(None, a, None)
 
-        e.match("'test' must be callable")
+        value = None
+        message = "'test' must be callable (got {value} that is a {type_})."
+        expected_message = message.format(value=value, type_=value.__class__)
+        assert expected_message == e.value.args[0]
+        assert value == e.value.args[1]
+        assert expected_message == e.value.message
+        assert value == e.value.value
 
     def test_repr(self):
         """