From 19624c2700b226f0b29a1f2a3156fd9d5bb5d714 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 23 Apr 2020 12:11:39 +0200 Subject: [PATCH 1/3] Add msilib and _msi to stubtest whitelist --- tests/stubtest_whitelists/py3_common.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/stubtest_whitelists/py3_common.txt b/tests/stubtest_whitelists/py3_common.txt index 8c3511c6e44e..1323a1f0e3b3 100644 --- a/tests/stubtest_whitelists/py3_common.txt +++ b/tests/stubtest_whitelists/py3_common.txt @@ -1,6 +1,7 @@ _csv.Dialect.__init__ _dummy_threading _importlib_modulespec +_msi _operator.methodcaller _posixsubprocess.cloexec_pipe _subprocess @@ -349,6 +350,7 @@ mailbox._mboxMMDF.get_string mailbox.mbox.__init__ mimetypes.read_mime_types mmap.mmap.__iter__ +msilib(.[a-z]+)? msvcrt multiprocessing.Array multiprocessing.Event From 329cdca83c59cdba8447017b11e2d13c394265e1 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 23 Apr 2020 12:19:25 +0200 Subject: [PATCH 2/3] Group Windows-only modules --- tests/stubtest_whitelists/py3_common.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/stubtest_whitelists/py3_common.txt b/tests/stubtest_whitelists/py3_common.txt index 1323a1f0e3b3..a14753db8710 100644 --- a/tests/stubtest_whitelists/py3_common.txt +++ b/tests/stubtest_whitelists/py3_common.txt @@ -1,7 +1,6 @@ _csv.Dialect.__init__ _dummy_threading _importlib_modulespec -_msi _operator.methodcaller _posixsubprocess.cloexec_pipe _subprocess @@ -9,7 +8,6 @@ _types _weakref.CallableProxyType.__getattr__ _weakref.ProxyType.__getattr__ _weakref.ReferenceType.__call__ -_winapi abc.abstractclassmethod abc.abstractmethod abc.abstractstaticmethod @@ -350,8 +348,6 @@ mailbox._mboxMMDF.get_string mailbox.mbox.__init__ mimetypes.read_mime_types mmap.mmap.__iter__ -msilib(.[a-z]+)? -msvcrt multiprocessing.Array multiprocessing.Event multiprocessing.JoinableQueue @@ -559,7 +555,6 @@ webbrowser.UnixBrowser.raise_opts webbrowser.UnixBrowser.remote_action webbrowser.UnixBrowser.remote_action_newtab webbrowser.UnixBrowser.remote_action_newwin -winsound wsgiref.types wsgiref.util.FileWrapper.__init__ wsgiref.util.FileWrapper.close @@ -575,6 +570,13 @@ zipfile.ZipExtFile.read zipfile.ZipExtFile.readline zlib.compressobj +# Modules that do not exist on Linux systems and cannot be checked by our CI process. +_msi +_winapi +msilib(.[a-z]+)? +msvcrt +winsound + # ========== # Whitelist entries that cannot or should not be fixed # ========== From 67116a44a185db806bab5d62cdd81cd939d84ab6 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 23 Apr 2020 21:19:04 +0200 Subject: [PATCH 3/3] Move win modules to bottom Make win modules optional --- tests/stubtest_whitelists/py3_common.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/stubtest_whitelists/py3_common.txt b/tests/stubtest_whitelists/py3_common.txt index a14753db8710..05632856670b 100644 --- a/tests/stubtest_whitelists/py3_common.txt +++ b/tests/stubtest_whitelists/py3_common.txt @@ -570,13 +570,6 @@ zipfile.ZipExtFile.read zipfile.ZipExtFile.readline zlib.compressobj -# Modules that do not exist on Linux systems and cannot be checked by our CI process. -_msi -_winapi -msilib(.[a-z]+)? -msvcrt -winsound - # ========== # Whitelist entries that cannot or should not be fixed # ========== @@ -621,3 +614,10 @@ os.SCHED_[A-Z_]+ socket.AF_DECnet socket.[A-Z0-9_]+ (termios.[A-Z0-9_]+)? + +# Modules that do not exist on Linux systems and cannot be checked by our CI process. +(_msi)? +(_winapi)? +(msilib(.[a-z]+)?)? +(msvcrt)? +(winsound)?