summaryrefslogtreecommitdiff
path: root/mocker.py
diff options
context:
space:
mode:
Diffstat (limited to 'mocker.py')
-rw-r--r--mocker.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mocker.py b/mocker.py
index ac6d1d5..a49675f 100644
--- a/mocker.py
+++ b/mocker.py
@@ -1092,9 +1092,12 @@ class Mock(object):
def __nonzero__(self):
try:
- return self.__mocker_act__("nonzero")
+ result = self.__mocker_act__("nonzero")
except MatchError, e:
return True
+ if type(result) is Mock:
+ return True
+ return result
def __iter__(self):
# XXX On py3k, when next() becomes __next__(), we'll be able