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.

1 files changed, 2 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):