-

Ram Rachum · Ram Rachum · commit 86020730f030 · 2011-02-05T22:04:43.000-05:00
diff --git a/garlicsim/garlicsim/general_misc/cute_testing.py b/garlicsim/garlicsim/general_misc/cute_testing.py
@@ -70,14 +70,16 @@ def manage_context(self):
             if self.assert_exact_type:
                 if self.exception_type is not type(exception):
                     assert issubclass(type(exception), self.exception_type)
-                    raise Failure("The exception `%s` was raised, and it *is* "
-                                  "an instance of the `%s` we were expecting; "
-                                  "but its type is not `%s`, it's `%s`, which "
-                                  "is a subclass of `%s`, but you specified "
-                                  "`assert_exact_type=True`, so subclasses "
-                                  "aren't acceptable" % (exception,
-                                  self.exception_type, self.exception_type,
-                                  type(exception), self.exception_type))
+                    raise Failure(
+                        "The exception `%s` was raised, and it *is* an "
+                        "instance of the `%s` we were expecting; but its type "
+                        "is not `%s`, it's `%s`, which is a subclass of `%s`, "
+                        "but you specified `assert_exact_type=True`, so "
+                        "subclasses aren't acceptable." % (repr(exception),
+                        self.exception_type.__name__,
+                        self.exception_type.__name__, type(exception).__name__,
+                        self.exception_type.__name__)
+                    )
             if self.text:
                 message = exception.args[0]
                 if isinstance(self.text, basestring):
diff --git a/garlicsim/test_garlicsim/test_general_misc/test_cute_testing/test_raise_assertor.py b/garlicsim/test_garlicsim/test_general_misc/test_cute_testing/test_raise_assertor.py
@@ -101,13 +101,13 @@ def test_assert_exact_type():
     with RaiseAssertor(LookupError):
         raise KeyError("Look at me, I'm a KeyError")
     
-    error_message = \
-        ("The exception `KeyError(\"Look at me, I'm a KeyError\")` was raised, and it *is* "
-         "an instance of the `LookupError` we were expecting; "
-         "but its type is not `LookupError`, it's `KeyError`, which "
-         "is a subclass of `LookupError`, but you specified "
-         "`assert_exact_type=True`, so subclasses "
-         "aren't acceptable")
+    error_message = (
+        "The exception `KeyError(\"Look at me, I'm a KeyError\",)` was "
+        "raised, and it *is* an instance of the `LookupError` we were "
+        "expecting; but its type is not `LookupError`, it's `KeyError`, which "
+        "is a subclass of `LookupError`, but you specified "
+        "`assert_exact_type=True`, so subclasses aren't acceptable."
+    )
     
     with RaiseAssertor(Failure, error_message):
         with RaiseAssertor(LookupError, assert_exact_type=True):
