Merging branch from Thomas which changes Mocker.patch() to use the

patcher when setting __mocker_mock__, rather than setting it in a
persistent way.

2 files changed, 3 insertions, 1 deletions

diff --git a/mocker.py b/mocker.py
index e4a8f04..3b24111 100644
--- a/mocker.py
+++ b/mocker.py
@@ -670,7 +670,7 @@ class MockerBase(object):
         event.add_task(patcher)
         mock = Mock(self, object=object, patcher=patcher,
                     passthrough=True, spec=spec)
-        object.__mocker_mock__ = mock
+        patcher.patch_attr(object, '__mocker_mock__', mock)
         return mock
 
     def act(self, path):
diff --git a/test.py b/test.py
index 4f3c39b..43b0a7b 100755
--- a/test.py
+++ b/test.py
@@ -3947,6 +3947,8 @@ class PatcherTest(TestCase):
         self.mocker.replay()
         self.assertEquals(self.C().method(), "mocked")
         self.assertRaises(AssertionError, self.C().method)
+        self.mocker.restore()
+        self.assertEquals(getattr(self.C, "__mocker_mock__", None), None)
 
     def test_recorder_instance_getattr(self):
         self.C.attr = "original"