summaryrefslogtreecommitdiff
path: root/mock.py
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2011-09-26 18:59:41 +0100
committerMichael Foord <michael@voidspace.org.uk>2011-09-26 18:59:41 +0100
commit5b69a4fd657e3cffc0bc4779969f8e2a049916b9 (patch)
treeb8d6676e327572d0a8a51fe3b6cec7f5b8458357 /mock.py
parentb1d0aeee358e950806b6b81a982136f91bda12dc (diff)
downloadmock-5b69a4fd657e3cffc0bc4779969f8e2a049916b9.tar.gz
Attribute deletion specified and tested
Diffstat (limited to 'mock.py')
-rw-r--r--mock.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/mock.py b/mock.py
index 3a162a2..f86197f 100644
--- a/mock.py
+++ b/mock.py
@@ -773,7 +773,6 @@ class NonCallableMock(Base):
pass
elif _check_and_set_parent(self, value, name, name):
self._mock_children[name] = value
- return
return object.__setattr__(self, name, value)
@@ -784,9 +783,6 @@ class NonCallableMock(Base):
# for magic methods that are still MagicProxy objects and
# not set on the instance itself
return
- elif name in self._mock_children:
- del self._mock_children[name]
- return
return object.__delattr__(self, name)