https://github.com/python/cpython/commit/1e4815692f6c8a37a3974d0d7d2025494d026d76
commit: 1e4815692f6c8a37a3974d0d7d2025494d026d76
branch: main
author: Nikita Sobolev <[email protected]>
committer: cjw296 <[email protected]>
date: 2024-06-19T21:35:11+01:00
summary:
gh-120732: Fix `name` passing to `Mock`, when using kwargs to `create_autospec`
(#120737)
files:
A Misc/NEWS.d/next/Library/2024-06-19-15-06-58.gh-issue-120732.OvYV9b.rst
M Lib/test/test_unittest/testmock/testmock.py
M Lib/unittest/mock.py
diff --git a/Lib/test/test_unittest/testmock/testmock.py
b/Lib/test/test_unittest/testmock/testmock.py
index 77f6f1eb4b76b9..e1b108f81e513c 100644
--- a/Lib/test/test_unittest/testmock/testmock.py
+++ b/Lib/test/test_unittest/testmock/testmock.py
@@ -129,6 +129,11 @@ def
test_create_autospec_should_be_configurable_by_kwargs(self):
# pass kwargs with respect to the parent mock.
self.assertEqual(class_mock().return_value.meth.side_effect, None)
+ def test_create_autospec_correctly_handles_name(self):
+ class X: ...
+ mock = create_autospec(X, spec_set=True, name="Y")
+ self.assertEqual(mock._mock_name, "Y")
+
def test_repr(self):
mock = Mock(name='foo')
self.assertIn('foo', repr(mock))
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 08975e0e1bd132..d50535dffeb5d1 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -2755,6 +2755,12 @@ def create_autospec(spec, spec_set=False,
instance=False, _parent=None,
if not unsafe:
_check_spec_arg_typos(kwargs)
+ _name = kwargs.pop('name', _name)
+ _new_name = _name
+ if _parent is None:
+ # for a top level object no _new_name should be set
+ _new_name = ''
+
_kwargs.update(kwargs)
Klass = MagicMock
@@ -2772,13 +2778,6 @@ def create_autospec(spec, spec_set=False,
instance=False, _parent=None,
elif is_type and instance and not _instance_callable(spec):
Klass = NonCallableMagicMock
- _name = _kwargs.pop('name', _name)
-
- _new_name = _name
- if _parent is None:
- # for a top level object no _new_name should be set
- _new_name = ''
-
mock = Klass(parent=_parent, _new_parent=_parent, _new_name=_new_name,
name=_name, **_kwargs)
diff --git
a/Misc/NEWS.d/next/Library/2024-06-19-15-06-58.gh-issue-120732.OvYV9b.rst
b/Misc/NEWS.d/next/Library/2024-06-19-15-06-58.gh-issue-120732.OvYV9b.rst
new file mode 100644
index 00000000000000..e31c4dd3192d60
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-06-19-15-06-58.gh-issue-120732.OvYV9b.rst
@@ -0,0 +1,2 @@
+Fix ``name`` passing to :class:`unittest.mock.Mock` object when using
+:func:`unittest.mock.create_autospec`.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
