mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-104745: Limit starting a patcher more than once without stopping it (#126649)

Browse source 
Previously, this would cause an `AttributeError` if the patch stopped more than once after this, and would also disrupt the original patched object.

---------

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
Red4Ru 2024-11-13 11:20:38 +03:00 • committed by GitHub
parent 2e39d77dde
commit 1e40c5ba47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 62 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/unittest/mock.py
View file

@ -1360,6 +1360,7 @@ class _patch(object):
self.autospec = autospec
self.kwargs = kwargs
self.additional_patchers = []
self.is_started = False
def copy(self):
@ -1472,6 +1473,9 @@ class _patch(object):
def __enter__(self):
"""Perform the patch."""
if self.is_started:
raise RuntimeError("Patch is already started")
new, spec, spec_set = self.new, self.spec, self.spec_set
autospec, kwargs = self.autospec, self.kwargs
new_callable = self.new_callable
@ -1603,6 +1607,7 @@ class _patch(object):
self.temp_original = original
self.is_local = local
self._exit_stack = contextlib.ExitStack()
self.is_started = True
try:
setattr(self.target, self.attribute, new_attr)
if self.attribute_name is not None:
@ -1622,6 +1627,9 @@ class _patch(object):
def __exit__(self, *exc_info):
"""Undo the patch."""
if not self.is_started:
return
if self.is_local and self.temp_original is not DEFAULT:
setattr(self.target, self.attribute, self.temp_original)
else:
@ -1638,6 +1646,7 @@ class _patch(object):
del self.target
exit_stack = self._exit_stack
del self._exit_stack
self.is_started = False
return exit_stack.__exit__(*exc_info)