Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 78e0b3c

Browse files
authored
Stubtest: allowlist all of distutils on 3.11 (#8411)
Fixes #8410
1 parent 48e502c commit 78e0b3c

9 files changed

Lines changed: 196 additions & 50 deletions

File tree

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
_?curses.color_pair
22
xxlimited.Xxo.x_exports
3-
distutils.util.__warningregistry__
43

54
# Exists at runtime, missing from stub
65
socket.TCP_CONNECTION_INFO

tests/stubtest_allowlists/linux-py311.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
_?curses.color_pair
2-
distutils.command.build_ext.__warningregistry__
32
mmap.MAP_STACK
43
(os|posix).EFD_CLOEXEC
54
(os|posix).EFD_NONBLOCK

tests/stubtest_allowlists/py310.txt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,3 +175,51 @@ builtins.property.__get__
175175
builtins.staticmethod.__get__
176176
types.FunctionType.__get__
177177
types.LambdaType.__get__
178+
179+
# Missing from distutils (deprecated, to be removed in 3.12)
180+
distutils.core.Command.dump_options
181+
distutils.core.Command.ensure_finalized
182+
distutils.core.Distribution.announce
183+
distutils.core.Distribution.common_usage
184+
distutils.core.Distribution.display_option_names
185+
distutils.core.Distribution.display_options
186+
distutils.core.Distribution.dump_option_dicts
187+
distutils.core.Distribution.find_config_files
188+
distutils.core.Distribution.get_command_packages
189+
distutils.core.Distribution.global_options
190+
distutils.core.Distribution.has_c_libraries
191+
distutils.core.Distribution.has_data_files
192+
distutils.core.Distribution.has_ext_modules
193+
distutils.core.Distribution.has_headers
194+
distutils.core.Distribution.has_modules
195+
distutils.core.Distribution.has_pure_modules
196+
distutils.core.Distribution.has_scripts
197+
distutils.core.Distribution.is_pure
198+
distutils.core.Distribution.negative_opt
199+
distutils.core.Distribution.parse_command_line
200+
distutils.core.Distribution.print_command_list
201+
distutils.core.Distribution.reinitialize_command
202+
distutils.core.Distribution.run_commands
203+
distutils.cygwinccompiler.PIPE
204+
distutils.cygwinccompiler.is_cygwingcc
205+
distutils.dist.Distribution.announce
206+
distutils.dist.Distribution.common_usage
207+
distutils.dist.Distribution.display_option_names
208+
distutils.dist.Distribution.display_options
209+
distutils.dist.Distribution.dump_option_dicts
210+
distutils.dist.Distribution.find_config_files
211+
distutils.dist.Distribution.get_command_packages
212+
distutils.dist.Distribution.global_options
213+
distutils.dist.Distribution.has_c_libraries
214+
distutils.dist.Distribution.has_data_files
215+
distutils.dist.Distribution.has_ext_modules
216+
distutils.dist.Distribution.has_headers
217+
distutils.dist.Distribution.has_modules
218+
distutils.dist.Distribution.has_pure_modules
219+
distutils.dist.Distribution.has_scripts
220+
distutils.dist.Distribution.is_pure
221+
distutils.dist.Distribution.negative_opt
222+
distutils.dist.Distribution.parse_command_line
223+
distutils.dist.Distribution.print_command_list
224+
distutils.dist.Distribution.reinitialize_command
225+
distutils.dist.Distribution.run_commands

tests/stubtest_allowlists/py311.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ _operator.itemgetter.__vectorcalloffset__
1717
argparse._MutuallyExclusiveGroup.add_mutually_exclusive_group
1818
asynchat.__warningregistry__ # Removal planned for 3.12, can add if someone needs this
1919
configparser.LegacyInterpolation.__init__
20-
distutils.util.get_host_platform
2120
enum.Enum.__init__
2221
fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve
2322
ftplib.FTP.trust_server_pasv_ipv4_address
@@ -176,3 +175,7 @@ wsgiref.types.WSGIEnvironment
176175

177176
# https://github.com/python/mypy/issues/12821 (stubtest bug with Callable type alias)
178177
wsgiref.types.WSGIApplication
178+
179+
# stubtest confuses stdlib distutils with setuptools-bundled distutils (#8410),
180+
# and the whole directory is going to be removed in 3.12 anyway
181+
distutils\..*

tests/stubtest_allowlists/py37.txt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,51 @@ builtins.property.__get__
160160
builtins.staticmethod.__get__
161161
types.FunctionType.__get__
162162
types.LambdaType.__get__
163+
164+
# Missing from distutils (deprecated, to be removed in 3.12)
165+
distutils.core.Command.dump_options
166+
distutils.core.Command.ensure_finalized
167+
distutils.core.Distribution.announce
168+
distutils.core.Distribution.common_usage
169+
distutils.core.Distribution.display_option_names
170+
distutils.core.Distribution.display_options
171+
distutils.core.Distribution.dump_option_dicts
172+
distutils.core.Distribution.find_config_files
173+
distutils.core.Distribution.get_command_packages
174+
distutils.core.Distribution.global_options
175+
distutils.core.Distribution.has_c_libraries
176+
distutils.core.Distribution.has_data_files
177+
distutils.core.Distribution.has_ext_modules
178+
distutils.core.Distribution.has_headers
179+
distutils.core.Distribution.has_modules
180+
distutils.core.Distribution.has_pure_modules
181+
distutils.core.Distribution.has_scripts
182+
distutils.core.Distribution.is_pure
183+
distutils.core.Distribution.negative_opt
184+
distutils.core.Distribution.parse_command_line
185+
distutils.core.Distribution.print_command_list
186+
distutils.core.Distribution.reinitialize_command
187+
distutils.core.Distribution.run_commands
188+
distutils.cygwinccompiler.PIPE
189+
distutils.cygwinccompiler.is_cygwingcc
190+
distutils.dist.Distribution.announce
191+
distutils.dist.Distribution.common_usage
192+
distutils.dist.Distribution.display_option_names
193+
distutils.dist.Distribution.display_options
194+
distutils.dist.Distribution.dump_option_dicts
195+
distutils.dist.Distribution.find_config_files
196+
distutils.dist.Distribution.get_command_packages
197+
distutils.dist.Distribution.global_options
198+
distutils.dist.Distribution.has_c_libraries
199+
distutils.dist.Distribution.has_data_files
200+
distutils.dist.Distribution.has_ext_modules
201+
distutils.dist.Distribution.has_headers
202+
distutils.dist.Distribution.has_modules
203+
distutils.dist.Distribution.has_pure_modules
204+
distutils.dist.Distribution.has_scripts
205+
distutils.dist.Distribution.is_pure
206+
distutils.dist.Distribution.negative_opt
207+
distutils.dist.Distribution.parse_command_line
208+
distutils.dist.Distribution.print_command_list
209+
distutils.dist.Distribution.reinitialize_command
210+
distutils.dist.Distribution.run_commands

tests/stubtest_allowlists/py38.txt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,51 @@ builtins.property.__get__
177177
builtins.staticmethod.__get__
178178
types.FunctionType.__get__
179179
types.LambdaType.__get__
180+
181+
# Missing from distutils (deprecated, to be removed in 3.12)
182+
distutils.core.Command.dump_options
183+
distutils.core.Command.ensure_finalized
184+
distutils.core.Distribution.announce
185+
distutils.core.Distribution.common_usage
186+
distutils.core.Distribution.display_option_names
187+
distutils.core.Distribution.display_options
188+
distutils.core.Distribution.dump_option_dicts
189+
distutils.core.Distribution.find_config_files
190+
distutils.core.Distribution.get_command_packages
191+
distutils.core.Distribution.global_options
192+
distutils.core.Distribution.has_c_libraries
193+
distutils.core.Distribution.has_data_files
194+
distutils.core.Distribution.has_ext_modules
195+
distutils.core.Distribution.has_headers
196+
distutils.core.Distribution.has_modules
197+
distutils.core.Distribution.has_pure_modules
198+
distutils.core.Distribution.has_scripts
199+
distutils.core.Distribution.is_pure
200+
distutils.core.Distribution.negative_opt
201+
distutils.core.Distribution.parse_command_line
202+
distutils.core.Distribution.print_command_list
203+
distutils.core.Distribution.reinitialize_command
204+
distutils.core.Distribution.run_commands
205+
distutils.cygwinccompiler.PIPE
206+
distutils.cygwinccompiler.is_cygwingcc
207+
distutils.dist.Distribution.announce
208+
distutils.dist.Distribution.common_usage
209+
distutils.dist.Distribution.display_option_names
210+
distutils.dist.Distribution.display_options
211+
distutils.dist.Distribution.dump_option_dicts
212+
distutils.dist.Distribution.find_config_files
213+
distutils.dist.Distribution.get_command_packages
214+
distutils.dist.Distribution.global_options
215+
distutils.dist.Distribution.has_c_libraries
216+
distutils.dist.Distribution.has_data_files
217+
distutils.dist.Distribution.has_ext_modules
218+
distutils.dist.Distribution.has_headers
219+
distutils.dist.Distribution.has_modules
220+
distutils.dist.Distribution.has_pure_modules
221+
distutils.dist.Distribution.has_scripts
222+
distutils.dist.Distribution.is_pure
223+
distutils.dist.Distribution.negative_opt
224+
distutils.dist.Distribution.parse_command_line
225+
distutils.dist.Distribution.print_command_list
226+
distutils.dist.Distribution.reinitialize_command
227+
distutils.dist.Distribution.run_commands

tests/stubtest_allowlists/py39.txt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,51 @@ builtins.property.__get__
176176
builtins.staticmethod.__get__
177177
types.FunctionType.__get__
178178
types.LambdaType.__get__
179+
180+
# Missing from distutils (deprecated, to be removed in 3.12)
181+
distutils.core.Command.dump_options
182+
distutils.core.Command.ensure_finalized
183+
distutils.core.Distribution.announce
184+
distutils.core.Distribution.common_usage
185+
distutils.core.Distribution.display_option_names
186+
distutils.core.Distribution.display_options
187+
distutils.core.Distribution.dump_option_dicts
188+
distutils.core.Distribution.find_config_files
189+
distutils.core.Distribution.get_command_packages
190+
distutils.core.Distribution.global_options
191+
distutils.core.Distribution.has_c_libraries
192+
distutils.core.Distribution.has_data_files
193+
distutils.core.Distribution.has_ext_modules
194+
distutils.core.Distribution.has_headers
195+
distutils.core.Distribution.has_modules
196+
distutils.core.Distribution.has_pure_modules
197+
distutils.core.Distribution.has_scripts
198+
distutils.core.Distribution.is_pure
199+
distutils.core.Distribution.negative_opt
200+
distutils.core.Distribution.parse_command_line
201+
distutils.core.Distribution.print_command_list
202+
distutils.core.Distribution.reinitialize_command
203+
distutils.core.Distribution.run_commands
204+
distutils.cygwinccompiler.PIPE
205+
distutils.cygwinccompiler.is_cygwingcc
206+
distutils.dist.Distribution.announce
207+
distutils.dist.Distribution.common_usage
208+
distutils.dist.Distribution.display_option_names
209+
distutils.dist.Distribution.display_options
210+
distutils.dist.Distribution.dump_option_dicts
211+
distutils.dist.Distribution.find_config_files
212+
distutils.dist.Distribution.get_command_packages
213+
distutils.dist.Distribution.global_options
214+
distutils.dist.Distribution.has_c_libraries
215+
distutils.dist.Distribution.has_data_files
216+
distutils.dist.Distribution.has_ext_modules
217+
distutils.dist.Distribution.has_headers
218+
distutils.dist.Distribution.has_modules
219+
distutils.dist.Distribution.has_pure_modules
220+
distutils.dist.Distribution.has_scripts
221+
distutils.dist.Distribution.is_pure
222+
distutils.dist.Distribution.negative_opt
223+
distutils.dist.Distribution.parse_command_line
224+
distutils.dist.Distribution.print_command_list
225+
distutils.dist.Distribution.reinitialize_command
226+
distutils.dist.Distribution.run_commands

tests/stubtest_allowlists/py3_common.txt

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -646,44 +646,20 @@ distutils.command.build_ext.USER_BASE
646646
distutils.command.build_scripts.ST_MODE
647647
distutils.command.install.*
648648
distutils.command.install_scripts.ST_MODE
649-
distutils.core.Command.dump_options
650-
distutils.core.Command.ensure_finalized
651649
distutils.core.DEBUG
652650
distutils.core.USAGE
653-
distutils.core.Distribution.announce
654-
distutils.core.Distribution.common_usage
655-
distutils.core.Distribution.display_option_names
656-
distutils.core.Distribution.display_options
657-
distutils.core.Distribution.dump_option_dicts
658651
distutils.core.Distribution.finalize_options
659-
distutils.core.Distribution.find_config_files
660652
distutils.core.Distribution.get_command_class
661653
distutils.core.Distribution.get_command_list
662-
distutils.core.Distribution.get_command_packages
663-
distutils.core.Distribution.global_options
664654
distutils.core.Distribution.handle_display_options
665-
distutils.core.Distribution.has_c_libraries
666-
distutils.core.Distribution.has_data_files
667-
distutils.core.Distribution.has_ext_modules
668-
distutils.core.Distribution.has_headers
669-
distutils.core.Distribution.has_modules
670-
distutils.core.Distribution.has_pure_modules
671-
distutils.core.Distribution.has_scripts
672-
distutils.core.Distribution.is_pure
673-
distutils.core.Distribution.negative_opt
674-
distutils.core.Distribution.parse_command_line
675-
distutils.core.Distribution.print_command_list
676655
distutils.core.Distribution.print_commands
677-
distutils.core.Distribution.reinitialize_command
678656
distutils.core.Distribution.run_command
679-
distutils.core.Distribution.run_commands
680657
distutils.core.extension_keywords
681658
distutils.core.gen_usage
682659
distutils.core.setup_keywords
683660
distutils.cygwinccompiler.CONFIG_H_NOTOK
684661
distutils.cygwinccompiler.CONFIG_H_OK
685662
distutils.cygwinccompiler.CONFIG_H_UNCERTAIN
686-
distutils.cygwinccompiler.PIPE
687663
distutils.cygwinccompiler.CygwinCCompiler.compiler_type
688664
distutils.cygwinccompiler.CygwinCCompiler.exe_extension
689665
distutils.cygwinccompiler.CygwinCCompiler.obj_extension
@@ -695,36 +671,14 @@ distutils.cygwinccompiler.Mingw32CCompiler.compiler_type
695671
distutils.cygwinccompiler.check_config_h
696672
distutils.cygwinccompiler.get_msvcr
697673
distutils.cygwinccompiler.get_versions
698-
distutils.cygwinccompiler.is_cygwingcc
699674
distutils.dir_util.ensure_relative
700675
distutils.dist.DEBUG
701-
distutils.dist.Distribution.announce
702-
distutils.dist.Distribution.common_usage
703-
distutils.dist.Distribution.display_option_names
704-
distutils.dist.Distribution.display_options
705-
distutils.dist.Distribution.dump_option_dicts
706676
distutils.dist.Distribution.finalize_options
707-
distutils.dist.Distribution.find_config_files
708677
distutils.dist.Distribution.get_command_class
709678
distutils.dist.Distribution.get_command_list
710-
distutils.dist.Distribution.get_command_packages
711-
distutils.dist.Distribution.global_options
712679
distutils.dist.Distribution.handle_display_options
713-
distutils.dist.Distribution.has_c_libraries
714-
distutils.dist.Distribution.has_data_files
715-
distutils.dist.Distribution.has_ext_modules
716-
distutils.dist.Distribution.has_headers
717-
distutils.dist.Distribution.has_modules
718-
distutils.dist.Distribution.has_pure_modules
719-
distutils.dist.Distribution.has_scripts
720-
distutils.dist.Distribution.is_pure
721-
distutils.dist.Distribution.negative_opt
722-
distutils.dist.Distribution.parse_command_line
723-
distutils.dist.Distribution.print_command_list
724680
distutils.dist.Distribution.print_commands
725-
distutils.dist.Distribution.reinitialize_command
726681
distutils.dist.Distribution.run_command
727-
distutils.dist.Distribution.run_commands
728682
distutils.dist.DistributionMetadata.set_classifiers
729683
distutils.dist.DistributionMetadata.set_keywords
730684
distutils.dist.DistributionMetadata.set_platforms

tests/stubtest_allowlists/win32-py311.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ asyncio.IocpProactor.sendto
99
asyncio.windows_events.IocpProactor.recvfrom
1010
asyncio.windows_events.IocpProactor.recvfrom_into
1111
asyncio.windows_events.IocpProactor.sendto
12-
distutils.command.build_ext.__warningregistry__
1312
msvcrt.GetErrorMode
1413
os.EX_OK
1514
subprocess.STARTUPINFO.copy

0 commit comments

Comments
 (0)