Skip to content

Commit c17ee92

Browse files
AkuliAkuli
committed
combine together some distutils things
1 parent aefd542 commit c17ee92

File tree

9 files changed

+10
-180
lines changed

9 files changed

+10
-180
lines changed

‎tests/stubtest_allowlists/darwin.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ os.SCHED_[A-Z_]+
4848
(sqlite3(.dbapi2)?.Connection.load_extension)?
4949

5050
# Missing from stubs, found by removing --ignore-missing-stub
51-
distutils.msvccompiler.MSVCCompiler.get_msvc_paths
52-
distutils.msvccompiler.MSVCCompiler.set_path_env_var
53-
distutils.msvccompiler.MacroExpander
5451
grp.struct_group.n_fields
5552
grp.struct_group.n_sequence_fields
5653
grp.struct_group.n_unnamed_fields

‎tests/stubtest_allowlists/linux.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ os.SCHED_[A-Z_]+
5151
(sqlite3(.dbapi2)?.Connection.load_extension)?
5252

5353
# Missing from stubs, found by removing --ignore-missing-stub
54-
distutils.msvccompiler.MSVCCompiler.get_msvc_paths
55-
distutils.msvccompiler.MSVCCompiler.set_path_env_var
56-
distutils.msvccompiler.MacroExpander
5754
grp.struct_group.n_fields
5855
grp.struct_group.n_sequence_fields
5956
grp.struct_group.n_unnamed_fields

‎tests/stubtest_allowlists/py310.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ asyncio.tasks._leave_task
203203
asyncio.tasks._register_task
204204
asyncio.tasks._unregister_task
205205
bdb.Breakpoint.clearBreakpoints
206-
distutils.dist.DistributionMetadata.set_classifiers
207-
distutils.dist.DistributionMetadata.set_keywords
208-
distutils.dist.DistributionMetadata.set_platforms
209-
distutils.util.get_host_platform
210206
email.headerregistry.MessageIDHeader.max_count
211207
ftplib.FTP.trust_server_pasv_ipv4_address
212208
importlib.abc.TraversableResources

‎tests/stubtest_allowlists/py36.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@ asyncio.futures._TracebackLogger.loop
8888
asyncio.futures._TracebackLogger.source_traceback
8989
asyncio.tasks.async
9090
calendar.HTMLCalendar.cssclasses
91-
distutils.cmd.install_misc
92-
distutils.command.bdist_wininst
93-
distutils.command.bdist_wininst.bdist_wininst
94-
distutils.sysconfig.expand_makefile_vars
95-
distutils.sysconfig.get_python_version
9691
dummy_threading.Barrier
9792
dummy_threading.BoundedSemaphore
9893
dummy_threading.BrokenBarrierError

‎tests/stubtest_allowlists/py37.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@ asyncio.tasks._leave_task
9090
asyncio.tasks._register_task
9191
asyncio.tasks._unregister_task
9292
contextvars.ContextVar.__class_getitem__
93-
distutils.command.bdist_wininst
94-
distutils.command.bdist_wininst.bdist_wininst
95-
distutils.dist.DistributionMetadata.set_classifiers
96-
distutils.dist.DistributionMetadata.set_keywords
97-
distutils.dist.DistributionMetadata.set_platforms
98-
distutils.sysconfig.expand_makefile_vars
99-
distutils.sysconfig.get_python_version
10093
dummy_threading.Barrier
10194
dummy_threading.BoundedSemaphore
10295
dummy_threading.BrokenBarrierError

‎tests/stubtest_allowlists/py38.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,6 @@ asyncio.tasks._leave_task
112112
asyncio.tasks._register_task
113113
asyncio.tasks._unregister_task
114114
contextvars.ContextVar.__class_getitem__
115-
distutils.command.bdist_wininst
116-
distutils.command.bdist_wininst.bdist_wininst
117-
distutils.dist.DistributionMetadata.set_classifiers
118-
distutils.dist.DistributionMetadata.set_keywords
119-
distutils.dist.DistributionMetadata.set_platforms
120-
distutils.sysconfig.expand_makefile_vars
121-
distutils.sysconfig.get_python_version
122-
distutils.util.get_host_platform
123115
dummy_threading.Barrier
124116
dummy_threading.BoundedSemaphore
125117
dummy_threading.BrokenBarrierError

‎tests/stubtest_allowlists/py39.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,6 @@ collections.Awaitable.__class_getitem__
138138
collections.Container.__class_getitem__
139139
collections.Iterable.__class_getitem__
140140
collections.MappingView.__class_getitem__
141-
distutils.command.bdist_wininst
142-
distutils.command.bdist_wininst.bdist_wininst
143-
distutils.dist.DistributionMetadata.set_classifiers
144-
distutils.dist.DistributionMetadata.set_keywords
145-
distutils.dist.DistributionMetadata.set_platforms
146-
distutils.sysconfig.expand_makefile_vars
147-
distutils.sysconfig.get_python_version
148-
distutils.util.get_host_platform
149141
email.headerregistry.MessageIDHeader.max_count
150142
ftplib.FTP.trust_server_pasv_ipv4_address
151143
hmac.HMAC.digest_cons

‎tests/stubtest_allowlists/py3_common.txt

Lines changed: 10 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -321,164 +321,35 @@ ctypes.SetPointerType
321321
ctypes.c_voidp
322322
ctypes.util.test
323323
distutils.archive_util.check_archive_formats
324-
distutils.bcppcompiler.BCPPCompiler.compiler_type
325-
distutils.bcppcompiler.BCPPCompiler.exe_extension
326-
distutils.bcppcompiler.BCPPCompiler.executables
327-
distutils.bcppcompiler.BCPPCompiler.obj_extension
328-
distutils.bcppcompiler.BCPPCompiler.shared_lib_extension
329-
distutils.bcppcompiler.BCPPCompiler.shared_lib_format
330-
distutils.bcppcompiler.BCPPCompiler.src_extensions
331-
distutils.bcppcompiler.BCPPCompiler.static_lib_extension
332-
distutils.bcppcompiler.BCPPCompiler.static_lib_format
333-
distutils.ccompiler.CCompiler.EXECUTABLE
334-
distutils.ccompiler.CCompiler.SHARED_LIBRARY
335-
distutils.ccompiler.CCompiler.SHARED_OBJECT
336-
distutils.ccompiler.CCompiler.compiler_type
337-
distutils.ccompiler.CCompiler.exe_extension
338-
distutils.ccompiler.CCompiler.language_map
339-
distutils.ccompiler.CCompiler.language_order
340-
distutils.ccompiler.CCompiler.obj_extension
341-
distutils.ccompiler.CCompiler.set_executable
342-
distutils.ccompiler.CCompiler.shared_lib_extension
343-
distutils.ccompiler.CCompiler.shared_lib_format
344-
distutils.ccompiler.CCompiler.src_extensions
345-
distutils.ccompiler.CCompiler.static_lib_extension
346-
distutils.ccompiler.CCompiler.static_lib_format
324+
distutils.bcppcompiler.BCPPCompiler.\w+
325+
distutils.ccompiler.CCompiler.\w+
347326
distutils.cmd.Command.dump_options
348327
distutils.cmd.Command.ensure_finalized
349-
distutils.command.bdist
350-
distutils.command.bdist_dumb
351-
distutils.command.bdist_rpm
352-
distutils.command.build
353-
distutils.command.build_clib
354-
distutils.command.build_ext
355-
distutils.command.build_py
356-
distutils.command.build_scripts
357-
distutils.command.check
358-
distutils.command.clean
359-
distutils.command.install
360-
distutils.command.install_data
361-
distutils.command.install_headers
362-
distutils.command.install_lib
363-
distutils.command.install_scripts
364-
distutils.command.register
365-
distutils.command.sdist
366-
distutils.command.upload
328+
distutils.command.\w+
367329
distutils.core.Command.dump_options
368330
distutils.core.Command.ensure_finalized
369-
distutils.core.Distribution.announce
370-
distutils.core.Distribution.common_usage
371-
distutils.core.Distribution.display_option_names
372-
distutils.core.Distribution.display_options
373-
distutils.core.Distribution.dump_option_dicts
374-
distutils.core.Distribution.finalize_options
375-
distutils.core.Distribution.find_config_files
376-
distutils.core.Distribution.get_command_class
377-
distutils.core.Distribution.get_command_list
378-
distutils.core.Distribution.get_command_packages
379-
distutils.core.Distribution.global_options
380-
distutils.core.Distribution.handle_display_options
381-
distutils.core.Distribution.has_c_libraries
382-
distutils.core.Distribution.has_data_files
383-
distutils.core.Distribution.has_ext_modules
384-
distutils.core.Distribution.has_headers
385-
distutils.core.Distribution.has_modules
386-
distutils.core.Distribution.has_pure_modules
387-
distutils.core.Distribution.has_scripts
388-
distutils.core.Distribution.is_pure
389-
distutils.core.Distribution.negative_opt
390-
distutils.core.Distribution.parse_command_line
391-
distutils.core.Distribution.print_command_list
392-
distutils.core.Distribution.print_commands
393-
distutils.core.Distribution.reinitialize_command
394-
distutils.core.Distribution.run_command
395-
distutils.core.Distribution.run_commands
331+
distutils.core.Distribution.\w+
396332
distutils.core.gen_usage
397-
distutils.cygwinccompiler.CygwinCCompiler.compiler_type
398-
distutils.cygwinccompiler.CygwinCCompiler.exe_extension
399-
distutils.cygwinccompiler.CygwinCCompiler.obj_extension
400-
distutils.cygwinccompiler.CygwinCCompiler.shared_lib_extension
401-
distutils.cygwinccompiler.CygwinCCompiler.shared_lib_format
402-
distutils.cygwinccompiler.CygwinCCompiler.static_lib_extension
403-
distutils.cygwinccompiler.CygwinCCompiler.static_lib_format
333+
distutils.cygwinccompiler.CygwinCCompiler.\w+
404334
distutils.cygwinccompiler.Mingw32CCompiler.compiler_type
405335
distutils.cygwinccompiler.check_config_h
406336
distutils.cygwinccompiler.get_msvcr
407337
distutils.cygwinccompiler.get_versions
408338
distutils.cygwinccompiler.is_cygwingcc
409339
distutils.dir_util.ensure_relative
410-
distutils.dist.Distribution.announce
411-
distutils.dist.Distribution.common_usage
412-
distutils.dist.Distribution.display_option_names
413-
distutils.dist.Distribution.display_options
414-
distutils.dist.Distribution.dump_option_dicts
415-
distutils.dist.Distribution.finalize_options
416-
distutils.dist.Distribution.find_config_files
417-
distutils.dist.Distribution.get_command_class
418-
distutils.dist.Distribution.get_command_list
419-
distutils.dist.Distribution.get_command_packages
420-
distutils.dist.Distribution.global_options
421-
distutils.dist.Distribution.handle_display_options
422-
distutils.dist.Distribution.has_c_libraries
423-
distutils.dist.Distribution.has_data_files
424-
distutils.dist.Distribution.has_ext_modules
425-
distutils.dist.Distribution.has_headers
426-
distutils.dist.Distribution.has_modules
427-
distutils.dist.Distribution.has_pure_modules
428-
distutils.dist.Distribution.has_scripts
429-
distutils.dist.Distribution.is_pure
430-
distutils.dist.Distribution.negative_opt
431-
distutils.dist.Distribution.parse_command_line
432-
distutils.dist.Distribution.print_command_list
433-
distutils.dist.Distribution.print_commands
434-
distutils.dist.Distribution.reinitialize_command
435-
distutils.dist.Distribution.run_command
436-
distutils.dist.Distribution.run_commands
340+
distutils.dist.Distribution.\w+
437341
distutils.dist.fix_help_options
438342
distutils.extension.read_setup_file
439-
distutils.fancy_getopt.FancyGetopt.add_option
440-
distutils.fancy_getopt.FancyGetopt.get_attr_name
441-
distutils.fancy_getopt.FancyGetopt.has_option
442-
distutils.fancy_getopt.FancyGetopt.print_help
443-
distutils.fancy_getopt.FancyGetopt.set_aliases
444-
distutils.fancy_getopt.FancyGetopt.set_negative_aliases
445-
distutils.fancy_getopt.FancyGetopt.set_option_table
343+
distutils.fancy_getopt.FancyGetopt.\w+
446344
distutils.fancy_getopt.translate_longopt
447-
distutils.msvccompiler.MSVCCompiler.compiler_type
448-
distutils.msvccompiler.MSVCCompiler.exe_extension
449-
distutils.msvccompiler.MSVCCompiler.executables
450-
distutils.msvccompiler.MSVCCompiler.find_exe
451-
distutils.msvccompiler.MSVCCompiler.initialize
452-
distutils.msvccompiler.MSVCCompiler.obj_extension
453-
distutils.msvccompiler.MSVCCompiler.res_extension
454-
distutils.msvccompiler.MSVCCompiler.shared_lib_extension
455-
distutils.msvccompiler.MSVCCompiler.shared_lib_format
456-
distutils.msvccompiler.MSVCCompiler.src_extensions
457-
distutils.msvccompiler.MSVCCompiler.static_lib_extension
458-
distutils.msvccompiler.MSVCCompiler.static_lib_format
459-
distutils.msvccompiler.convert_mbcs
460-
distutils.msvccompiler.get_build_architecture
461-
distutils.msvccompiler.get_build_version
462-
distutils.msvccompiler.normalize_and_reduce_paths
463-
distutils.msvccompiler.read_keys
464-
distutils.msvccompiler.read_values
345+
distutils.msvccompiler.MSVCCompiler.\w+
346+
distutils.msvccompiler.\w+
465347
distutils.sysconfig.parse_config_h
466348
distutils.sysconfig.parse_makefile
467349
distutils.text_file.TextFile.default_options
468350
distutils.text_file.TextFile.error
469351
distutils.text_file.TextFile.gen_error
470-
distutils.unixccompiler.UnixCCompiler.compiler_type
471-
distutils.unixccompiler.UnixCCompiler.dylib_lib_extension
472-
distutils.unixccompiler.UnixCCompiler.dylib_lib_format
473-
distutils.unixccompiler.UnixCCompiler.executables
474-
distutils.unixccompiler.UnixCCompiler.obj_extension
475-
distutils.unixccompiler.UnixCCompiler.shared_lib_extension
476-
distutils.unixccompiler.UnixCCompiler.shared_lib_format
477-
distutils.unixccompiler.UnixCCompiler.src_extensions
478-
distutils.unixccompiler.UnixCCompiler.static_lib_extension
479-
distutils.unixccompiler.UnixCCompiler.static_lib_format
480-
distutils.unixccompiler.UnixCCompiler.xcode_stub_lib_extension
481-
distutils.unixccompiler.UnixCCompiler.xcode_stub_lib_format
352+
distutils.unixccompiler.UnixCCompiler.\w+
482353
distutils.util.grok_environment_error
483354
email.base64mime
484355
email.charset

‎tests/stubtest_allowlists/win32.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ tty
4242
# Missing from stubs, found by removing --ignore-missing-stub
4343
_msi.MSIError
4444
asyncio.windows_utils.Popen
45-
distutils.msvccompiler.MSVCCompiler.manifest_get_embed_info
46-
distutils.msvccompiler.MSVCCompiler.manifest_setup_ldargs
47-
distutils.msvccompiler.OldMSVCCompiler
4845
msvcrt.SetErrorMode
4946
os.ftruncate
5047
os.get_handle_inheritable

0 commit comments

Comments
 (0)