mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge

Browse source
This commit is contained in:
Michael Foord 2014-04-15 17:22:22 -04:00
commit 15f2d1775e
3 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/unittest/mock.py
View file

@ -1054,7 +1054,7 @@ def _is_started(patcher):
class _patch(object):
attribute_name = None
_active_patches = set()
_active_patches = []
def __init__(
self, getter, attribute, new, spec, create,
@ -1330,13 +1330,18 @@ class _patch(object):
def start(self):
"""Activate a patch, returning any created mock."""
result = self.__enter__()
self._active_patches.add(self)
self._active_patches.append(self)
return result
def stop(self):
"""Stop an active patch."""
self._active_patches.discard(self)
try:
self._active_patches.remove(self)
except ValueError:
# If the patch hasn't been started this will fail
pass
return self.__exit__()
@ -1629,8 +1634,8 @@ def _clear_dict(in_dict):
def _patch_stopall():
"""Stop all active patches."""
for patch in list(_patch._active_patches):
"""Stop all active patches. LIFO to unroll nested patches."""
for patch in reversed(_patch._active_patches):
patch.stop()