Mailman 3 January 2020 - Python-checkins

[3.7] bpo-39401: Avoid unsafe DLL load on Windows 7 and earlier (GH-18231) (GH-18232)
by Steve Dower Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/561c59777c8426fde0ef48b57cf02eddae… commit: 561c59777c8426fde0ef48b57cf02eddaeb2a5b8 branch: 3.7 author: Steve Dower <steve.dower(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-29T22:07:17-08:00 summary: [3.7] bpo-39401: Avoid unsafe DLL load on Windows 7 and earlier (GH-18231) (GH-18232) https://bugs.python.org/issue39401 Automerge-Triggered-By: @zooba files: A Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst M PC/getpathp.c M Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp diff --git a/Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst b/Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst new file mode 100644 index 0000000000000..5071e126b70d0 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-39401.he7h_A.rst @@ -0,0 +1 @@ +Avoid unsafe load of ``api-ms-win-core-path-l1-1-0.dll`` at startup on Windows 7. diff --git a/PC/getpathp.c b/PC/getpathp.c index 04764c9e5a0df..e3cd3ae1e9a60 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -245,7 +245,8 @@ static void join(wchar_t *buffer, const wchar_t *stuff) { if (_PathCchCombineEx_Initialized == 0) { - HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll"); + HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (pathapi) { _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx"); } @@ -278,7 +279,8 @@ static _PyInitError canonicalize(wchar_t *buffer, const wchar_t *path) } if (_PathCchCanonicalizeEx_Initialized == 0) { - HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll"); + HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (pathapi) { _PathCchCanonicalizeEx = (PPathCchCanonicalizeEx)GetProcAddress(pathapi, "PathCchCanonicalizeEx"); } diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index cd4a1f8feb1d4..af6cf0ca5849d 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -3028,8 +3028,16 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { } } else { if (IsWindows7SP1OrGreater()) { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Target OS is Windows 7 SP1 or later"); - return; + HMODULE hKernel32 = GetModuleHandleW(L"kernel32"); + if (hKernel32 && !GetProcAddress(hKernel32, "AddDllDirectory")) { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows 7 SP1 without KB2533623"); + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "KB2533623 update is required to continue."); + /* The "MissingSP1" error also specifies updates are required */ + LocGetString(_wixLoc, L"#(loc.FailureWin7MissingSP1)", &pLocString); + } else { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Target OS is Windows 7 SP1 or later"); + return; + } } else if (IsWindows7OrGreater()) { BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows 7 RTM"); BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Service Pack 1 is required to continue installation");

1 0

[3.7] bpo-39493: Fix definition of IO.closed in typing.py (GH-18273)
by Miss Islington (bot) Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/194c7aeb6f3d6c2b0015457d22b3825365… commit: 194c7aeb6f3d6c2b0015457d22b38253652f4f38 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-29T22:00:12-08:00 summary: [3.7] bpo-39493: Fix definition of IO.closed in typing.py (GH-18273) * bpo-39493: Fix definition of IO.closed in typing.py (GH-18265) (cherry picked from commit 2e6569b6692298fcc9aae0df3eb3181adb2a5099) Co-authored-by: Shantanu <hauntsaninja(a)users.noreply.github.com> * Use @absractproperty Co-authored-by: Shantanu <hauntsaninja(a)users.noreply.github.com> Co-authored-by: Guido van Rossum <guido(a)python.org> files: A Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst M Lib/typing.py diff --git a/Lib/typing.py b/Lib/typing.py index 607eb1f8fc31a..3b2e3720fff57 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1509,7 +1509,7 @@ def name(self) -> str: def close(self) -> None: pass - @abstractmethod + @abstractproperty def closed(self) -> bool: pass diff --git a/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst b/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst new file mode 100644 index 0000000000000..b676629a4414a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst @@ -0,0 +1 @@ +Mark ``typing.IO.closed`` as a property \ No newline at end of file

1 0

bpo-39493: Fix definition of IO.closed in typing.py (GH-18265)
by Miss Islington (bot) Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/58076df0c59677111dc77b72852cb2a313… commit: 58076df0c59677111dc77b72852cb2a313a2ef91 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-29T21:42:38-08:00 summary: bpo-39493: Fix definition of IO.closed in typing.py (GH-18265) (cherry picked from commit 2e6569b6692298fcc9aae0df3eb3181adb2a5099) Co-authored-by: Shantanu <hauntsaninja(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst M Lib/typing.py diff --git a/Lib/typing.py b/Lib/typing.py index 69f6d9873490a..83d310f3c0dd3 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1848,6 +1848,7 @@ def name(self) -> str: def close(self) -> None: pass + @property @abstractmethod def closed(self) -> bool: pass diff --git a/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst b/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst new file mode 100644 index 0000000000000..b676629a4414a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst @@ -0,0 +1 @@ +Mark ``typing.IO.closed`` as a property \ No newline at end of file

1 0

bpo-39494: Remove extra null terminators from kwlist vars (GH-18267)
by Alex Henrie Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/188bb5b1e868eecf2342195dc45caa332a… commit: 188bb5b1e868eecf2342195dc45caa332ac3b6c7 branch: master author: Alex Henrie <alexhenrie24(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-01-30T07:12:53+03:00 summary: bpo-39494: Remove extra null terminators from kwlist vars (GH-18267) files: M Modules/_sqlite/cursor.c M Modules/_sqlite/module.c diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 45f5865590d69..47dbc77474120 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -773,7 +773,7 @@ PyObject* pysqlite_cursor_fetchone(pysqlite_Cursor* self, PyObject* args) PyObject* pysqlite_cursor_fetchmany(pysqlite_Cursor* self, PyObject* args, PyObject* kwargs) { - static char *kwlist[] = {"size", NULL, NULL}; + static char *kwlist[] = {"size", NULL}; PyObject* row; PyObject* list; diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index d5c353ea7bee8..4d9d3d41c7b71 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -105,7 +105,7 @@ RAM instead of on disk."); static PyObject* module_complete(PyObject* self, PyObject* args, PyObject* kwargs) { - static char *kwlist[] = {"statement", NULL, NULL}; + static char *kwlist[] = {"statement", NULL}; char* statement; PyObject* result; @@ -135,7 +135,7 @@ Checks if a string contains a complete SQL statement. Non-standard."); static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyObject* kwargs) { - static char *kwlist[] = {"do_enable", NULL, NULL}; + static char *kwlist[] = {"do_enable", NULL}; int do_enable; int rc;

1 0

bpo-39493: Fix definition of IO.closed in typing.py (#18265)
by Shantanu Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/2e6569b6692298fcc9aae0df3eb3181adb… commit: 2e6569b6692298fcc9aae0df3eb3181adb2a5099 branch: master author: Shantanu <hauntsaninja(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-29T18:52:36-08:00 summary: bpo-39493: Fix definition of IO.closed in typing.py (#18265) files: A Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst M Lib/typing.py diff --git a/Lib/typing.py b/Lib/typing.py index 7de3e346eaa79..28c887ed35e0b 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1831,6 +1831,7 @@ def name(self) -> str: def close(self) -> None: pass + @property @abstractmethod def closed(self) -> bool: pass diff --git a/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst b/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst new file mode 100644 index 0000000000000..b676629a4414a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-30-01-13-19.bpo-39493.CbFRi7.rst @@ -0,0 +1 @@ +Mark ``typing.IO.closed`` as a property \ No newline at end of file

1 0

Improve grammar in the import system reference documentation (GH-18209)
by Bonifacio de Oliveira Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/d47d0c8e9f2ca0f9f5d1bf0b35006a9a4d… commit: d47d0c8e9f2ca0f9f5d1bf0b35006a9a4d5ca684 branch: master author: Bonifacio de Oliveira <bonifacio.segundo(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-01-29T18:23:50-08:00 summary: Improve grammar in the import system reference documentation (GH-18209) Replaced the period with a comma. Automerge-Triggered-By: @Mariatta files: M Doc/reference/import.rst diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst index 20a2ea69e2d27..4c36e15dc0606 100644 --- a/Doc/reference/import.rst +++ b/Doc/reference/import.rst @@ -857,7 +857,7 @@ module. ``find_spec()`` returns a fully populated spec for the module. This spec will always have "loader" set (with one exception). To indicate to the import machinery that the spec represents a namespace -:term:`portion`. the path entry finder sets "loader" on the spec to +:term:`portion`, the path entry finder sets "loader" on the spec to ``None`` and "submodule_search_locations" to a list containing the portion.

1 0

Remove deadcode in _Py_inc_count() (GH-18257)
by Victor Stinner Jan. 29, 2020

Jan. 29, 2020

https://github.com/python/cpython/commit/5428f48b6308c7fd71636077f2ebc307c9… commit: 5428f48b6308c7fd71636077f2ebc307c9a53d03 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-29T19:22:11+01:00 summary: Remove deadcode in _Py_inc_count() (GH-18257) (tp->tp_next != NULL) check became redundant with commit 45294a9562e5c360ee8ef8498d8792e05a6eb25e (merged in 2006). files: M Objects/object.c diff --git a/Objects/object.c b/Objects/object.c index 6fc114621c1d1..14533dba16d64 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -182,8 +182,6 @@ _Py_inc_count(PyTypeObject *tp) { if (tp->tp_next == NULL && tp->tp_prev == NULL) { /* first time; insert in linked list */ - if (tp->tp_next != NULL) /* sanity check */ - Py_FatalError("XXX _Py_inc_count sanity check"); if (type_list) type_list->tp_prev = tp; tp->tp_next = type_list;

1 0

Get mock coverage back to 100% (GH-18228)
by Chris Withers Jan. 29, 2020

Jan. 29, 2020

https://github.com/python/cpython/commit/db5e86adbce12350c26e7ffc2c66733699… commit: db5e86adbce12350c26e7ffc2c6673369971a2dc branch: master author: Chris Withers <chris(a)withers.org> committer: GitHub <noreply(a)github.com> date: 2020-01-29T16:24:54Z summary: Get mock coverage back to 100% (GH-18228) * use the `: pass` and `: yield` patterns for code that isn't expected to ever be executed. * The _Call items passed to _AnyComparer are only ever of length two, so assert instead of if/else * fix typo * Fix bug, where stop-without-start patching dict blows up with `TypeError: 'NoneType' object is not iterable`, highlighted by lack of coverage of an except branch. * The fix for bpo-37972 means _Call.count and _Call.index are no longer needed. * add coverage for calling next() on a mock_open with readline.return_value set. * __aiter__ is defined on the Mock so the one on _AsyncIterator is never called. files: M Lib/unittest/mock.py M Lib/unittest/test/testmock/testasync.py M Lib/unittest/test/testmock/testmock.py M Lib/unittest/test/testmock/testpatch.py diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 37ea5c7e45c8b..9e692981a229b 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -1042,8 +1042,7 @@ class _AnyComparer(list): the left.""" def __contains__(self, item): for _call in self: - if len(item) != len(_call): - continue + assert len(item) == len(_call) if all([ expected == actual for expected, actual in zip(item, _call) @@ -1856,7 +1855,8 @@ def _unpatch_dict(self): def __exit__(self, *args): """Unpatch the dict.""" - self._unpatch_dict() + if self._original is not None: + self._unpatch_dict() return False @@ -2168,7 +2168,7 @@ def __init__(self, /, *args, **kwargs): self.__dict__['__code__'] = code_mock async def _execute_mock_call(self, /, *args, **kwargs): - # This is nearly just like super(), except for sepcial handling + # This is nearly just like super(), except for special handling # of coroutines _call = self.call_args @@ -2541,12 +2541,6 @@ def __getattribute__(self, attr): return tuple.__getattribute__(self, attr) - def count(self, /, *args, **kwargs): - return self.__getattr__('count')(*args, **kwargs) - - def index(self, /, *args, **kwargs): - return self.__getattr__('index')(*args, **kwargs) - def _get_call_arguments(self): if len(self) == 2: args, kwargs = self @@ -2917,9 +2911,6 @@ def __init__(self, iterator): code_mock.co_flags = inspect.CO_ITERABLE_COROUTINE self.__dict__['__code__'] = code_mock - def __aiter__(self): - return self - async def __anext__(self): try: return next(self.iterator) diff --git a/Lib/unittest/test/testmock/testasync.py b/Lib/unittest/test/testmock/testasync.py index 992076db78706..bf936220ccaf2 100644 --- a/Lib/unittest/test/testmock/testasync.py +++ b/Lib/unittest/test/testmock/testasync.py @@ -16,38 +16,28 @@ def tearDownModule(): class AsyncClass: - def __init__(self): - pass - async def async_method(self): - pass - def normal_method(self): - pass + def __init__(self): pass + async def async_method(self): pass + def normal_method(self): pass @classmethod - async def async_class_method(cls): - pass + async def async_class_method(cls): pass @staticmethod - async def async_static_method(): - pass + async def async_static_method(): pass class AwaitableClass: - def __await__(self): - yield + def __await__(self): yield -async def async_func(): - pass +async def async_func(): pass -async def async_func_args(a, b, *, c): - pass +async def async_func_args(a, b, *, c): pass -def normal_func(): - pass +def normal_func(): pass class NormalClass(object): - def a(self): - pass + def a(self): pass async_foo_name = f'{__name__}.AsyncClass' @@ -402,8 +392,7 @@ def test_magicmock_lambda_spec(self): class AsyncArguments(IsolatedAsyncioTestCase): async def test_add_return_value(self): - async def addition(self, var): - return var + 1 + async def addition(self, var): pass mock = AsyncMock(addition, return_value=10) output = await mock(5) @@ -411,8 +400,7 @@ class AsyncArguments(IsolatedAsyncioTestCase): self.assertEqual(output, 10) async def test_add_side_effect_exception(self): - async def addition(var): - return var + 1 + async def addition(var): pass mock = AsyncMock(addition, side_effect=Exception('err')) with self.assertRaises(Exception): await mock(5) @@ -553,18 +541,14 @@ def test_magic_methods_are_async_functions(self): class AsyncContextManagerTest(unittest.TestCase): class WithAsyncContextManager: - async def __aenter__(self, *args, **kwargs): - return self + async def __aenter__(self, *args, **kwargs): pass - async def __aexit__(self, *args, **kwargs): - pass + async def __aexit__(self, *args, **kwargs): pass class WithSyncContextManager: - def __enter__(self, *args, **kwargs): - return self + def __enter__(self, *args, **kwargs): pass - def __exit__(self, *args, **kwargs): - pass + def __exit__(self, *args, **kwargs): pass class ProductionCode: # Example real-world(ish) code @@ -673,16 +657,9 @@ class WithAsyncIterator(object): def __init__(self): self.items = ["foo", "NormalFoo", "baz"] - def __aiter__(self): - return self - - async def __anext__(self): - try: - return self.items.pop() - except IndexError: - pass + def __aiter__(self): pass - raise StopAsyncIteration + async def __anext__(self): pass def test_aiter_set_return_value(self): mock_iter = AsyncMock(name="tester") diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index 677346725bdd2..9b9e066cc545d 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py @@ -1868,6 +1868,11 @@ def test_mock_open_using_next(self): with self.assertRaises(StopIteration): next(f1) + def test_mock_open_next_with_readline_with_return_value(self): + mopen = mock.mock_open(read_data='foo\nbarn') + mopen.return_value.readline.return_value = 'abc' + self.assertEqual('abc', next(mopen())) + def test_mock_open_write(self): # Test exception in file writing write() mock_namedtemp = mock.mock_open(mock.MagicMock(name='JLV')) diff --git a/Lib/unittest/test/testmock/testpatch.py b/Lib/unittest/test/testmock/testpatch.py index 438dfd8cfbcc0..f1bc0e1cd40a2 100644 --- a/Lib/unittest/test/testmock/testpatch.py +++ b/Lib/unittest/test/testmock/testpatch.py @@ -770,6 +770,14 @@ def test_patch_dict_start_stop(self): self.assertEqual(d, original) + def test_patch_dict_stop_without_start(self): + d = {'foo': 'bar'} + original = d.copy() + patcher = patch.dict(d, [('spam', 'eggs')], clear=True) + self.assertEqual(patcher.stop(), False) + self.assertEqual(d, original) + + def test_patch_dict_class_decorator(self): this = self d = {'spam': 'eggs'}

1 0

bpo-39485: fix corner-case in method-detection of mock (GH-18255)
by Miss Islington (bot) Jan. 29, 2020

Jan. 29, 2020

https://github.com/python/cpython/commit/696d2324cf2a54e20e8d6a6739fa97ba81… commit: 696d2324cf2a54e20e8d6a6739fa97ba815a8be9 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-29T16:15:36Z summary: bpo-39485: fix corner-case in method-detection of mock (GH-18255) Replace check for whether something is a method in the mock module. The previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the isinstance(getattr(result, '__get__', None), MethodWrapperTypes) check returns True for any descriptor, not just methods. This condition could also return erroneously True in CPython for C-defined descriptors. Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy. (cherry picked from commit a327677905956ae0b239ff430a1346dfe265709e) Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz(a)gmx.de> Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz(a)gmx.de> files: A Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst M Lib/unittest/mock.py diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 66ace80cb5f9c..204b3e7789b33 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -2715,7 +2715,7 @@ def _must_skip(spec, entry, is_type): continue if isinstance(result, (staticmethod, classmethod)): return False - elif isinstance(getattr(result, '__get__', None), MethodWrapperTypes): + elif isinstance(result, FunctionTypes): # Normal method => skip if looked up on type # (if looked up on instance, self is already skipped) return is_type @@ -2745,10 +2745,6 @@ def __init__(self, spec, spec_set=False, parent=None, type(ANY.__eq__), ) -MethodWrapperTypes = ( - type(ANY.__eq__.__get__), -) - file_spec = None diff --git a/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst b/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst new file mode 100644 index 0000000000000..f62c31fc686ad --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst @@ -0,0 +1,3 @@ +Fix a bug in :func:`unittest.mock.create_autospec` that would complain about +the wrong number of arguments for custom descriptors defined in an extension +module returning functions.

1 0

bpo-39485: fix corner-case in method-detection of mock (GH-18256)
by Miss Islington (bot) Jan. 29, 2020

Jan. 29, 2020

https://github.com/python/cpython/commit/cf0645a17acbc0c4dbbf82434e37637965… commit: cf0645a17acbc0c4dbbf82434e37637965748bbb branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-29T16:10:24Z summary: bpo-39485: fix corner-case in method-detection of mock (GH-18256) Replace check for whether something is a method in the mock module. The previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the isinstance(getattr(result, '__get__', None), MethodWrapperTypes) check returns True for any descriptor, not just methods. This condition could also return erroneously True in CPython for C-defined descriptors. Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy. (cherry picked from commit a327677905956ae0b239ff430a1346dfe265709e) Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz(a)gmx.de> Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz(a)gmx.de> files: A Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst M Lib/unittest/mock.py diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 372a6719be9fa..87e8735e958d5 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -2342,7 +2342,7 @@ def _must_skip(spec, entry, is_type): continue if isinstance(result, (staticmethod, classmethod)): return False - elif isinstance(getattr(result, '__get__', None), MethodWrapperTypes): + elif isinstance(result, FunctionTypes): # Normal method => skip if looked up on type # (if looked up on instance, self is already skipped) return is_type @@ -2381,10 +2381,6 @@ def __init__(self, spec, spec_set=False, parent=None, type(ANY.__eq__), ) -MethodWrapperTypes = ( - type(ANY.__eq__.__get__), -) - file_spec = None diff --git a/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst b/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst new file mode 100644 index 0000000000000..f62c31fc686ad --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst @@ -0,0 +1,3 @@ +Fix a bug in :func:`unittest.mock.create_autospec` that would complain about +the wrong number of arguments for custom descriptors defined in an extension +module returning functions.

1 0