Merged 328990-mocker-hides-exception branch from Duncan McGreggor. This

ensures that the raised AttributeError exception on a patched object
actually exposes the real problem rather than an internal Mocker
exception.

2 files changed, 17 insertions, 1 deletions

diff --git a/mocker.py b/mocker.py
index 3b24111..ac6d1d5 100644
--- a/mocker.py
+++ b/mocker.py
@@ -2020,6 +2020,7 @@ class Patcher(Task):
         try:
             return unpatched(*action.args, **action.kwargs)
         except AttributeError:
+            type, value, traceback = sys.exc_info()
             if action.kind == "getattr":
                 # The normal behavior of Python is to try __getattribute__,
                 # and if it raises AttributeError, try __getattr__.   We've
@@ -2031,7 +2032,7 @@ class Patcher(Task):
                     pass
                 else:
                     return __getattr__(*action.args, **action.kwargs)
-            raise
+            raise type, value, traceback
 
 
 class PatchedMethod(object):
diff --git a/test.py b/test.py
index e98acb8..2647141 100755
--- a/test.py
+++ b/test.py
@@ -3983,6 +3983,21 @@ class PatcherTest(TestCase):
         self.assertEquals(obj.method(), "original")
         self.assertRaises(AssertionError, obj.method)
 
+    def test_original_exception_raised(self):
+        class C(object):
+            def use_non_existing_attribute(self):
+                return self.bad_attribute
+
+        mock = self.mocker.patch(C)
+        mock.any_other_method()
+        self.mocker.replay()
+        obj = C()
+        try:
+            obj.use_non_existing_attribute()
+        except AttributeError, error:
+            message = "'C' object has no attribute 'bad_attribute'"
+            self.assertEquals(message, error.message)
+
 
 def main():
     try: