summaryrefslogtreecommitdiff
path: root/mocker.py
diff options
context:
space:
mode:
authorGustavo Niemeyer <gustavo@niemeyer.net>2008-07-01 14:25:44 -0300
committerGustavo Niemeyer <gustavo@niemeyer.net>2008-07-01 14:25:44 -0300
commit9aef58ec39a9395d7427aa3b938e96b9d021467a (patch)
treeeeae1766024095aba05fafc498d412d8b7372fb7 /mocker.py
parenta2a848a3c15915639e33241a4016846a9e082906 (diff)
parent77375c5cf3c1f47006322c7c693a3fda9ac383d6 (diff)
downloadmocker-9aef58ec39a9395d7427aa3b938e96b9d021467a.tar.gz
Merging branch from Thomas which changes Mocker.patch() to use the
patcher when setting __mocker_mock__, rather than setting it in a persistent way.
Diffstat (limited to 'mocker.py')
-rw-r--r--mocker.py2
1 files changed, 1 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):