py2docfx 0.1.13.dev2016838__py3-none-any.whl → 0.1.13.dev2021865__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/_modified.py +26 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/_msvccompiler.py +2 -603
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/archive_util.py +48 -18
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/ccompiler.py +17 -1257
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/cmd.py +133 -41
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/bdist.py +19 -8
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/bdist_dumb.py +2 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/bdist_rpm.py +6 -5
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build.py +8 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build_clib.py +8 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build_ext.py +32 -13
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build_py.py +10 -9
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/build_scripts.py +3 -14
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/check.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/clean.py +2 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/config.py +1 -8
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/install.py +22 -19
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/install_data.py +4 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/install_headers.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/install_lib.py +11 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/install_scripts.py +4 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/command/sdist.py +22 -16
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compat/__init__.py +6 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/base.py +1391 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/cygwin.py +340 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/errors.py +24 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/msvc.py +614 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/{tests/test_ccompiler.py → compilers/C/tests/test_base.py} +9 -19
- py2docfx/venv/{venv1/Lib/site-packages/setuptools/_distutils/tests/test_cygwinccompiler.py → basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/tests/test_cygwin.py} +7 -12
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/{tests/test_mingwccompiler.py → compilers/C/tests/test_mingw.py} +12 -20
- py2docfx/venv/{venv1/Lib/site-packages/setuptools/_distutils/tests/test_msvccompiler.py → basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/tests/test_msvc.py} +11 -12
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/{tests/test_unixccompiler.py → compilers/C/tests/test_unix.py} +5 -5
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/unix.py +409 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compilers/C/zos.py +230 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/cygwinccompiler.py +20 -328
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/dist.py +148 -80
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/errors.py +11 -27
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/extension.py +19 -16
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/filelist.py +80 -15
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/spawn.py +22 -5
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/sysconfig.py +32 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/tests/test_build_ext.py +13 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/tests/test_sdist.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/unixccompiler.py +2 -401
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/util.py +38 -23
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/zosccompiler.py +2 -228
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_static.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/editable_wheel.py +3 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/install.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/test_setupcfg.py +2 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_build_py.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/unicode_utils.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/__init__.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/ado_consts.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/adodbapi.py +22 -26
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/apibase.py +3 -4
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/examples/db_print.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/examples/db_table_names.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/process_connect_string.py +7 -7
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/setup.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/test/adodbapitest.py +21 -73
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/test/adodbapitestconfig.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/test/dbapi20.py +11 -17
- py2docfx/venv/venv1/Lib/site-packages/adodbapi/test/setuptestframework.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/isapi/install.py +8 -11
- py2docfx/venv/venv1/Lib/site-packages/isapi/samples/redirector.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/isapi/samples/redirector_asynch.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/isapi/samples/redirector_with_filter.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/isapi/simple.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/isapi/threaded_extension.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/app/basictimerapp.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/app/customprint.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/app/demoutils.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/cmdserver.py +2 -5
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/guidemo.py +14 -41
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/objdoc.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/ocx/demoutils.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/ocx/flash.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/ocx/ocxserialtest.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/ocx/ocxtest.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/ocx/webbrowser.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/openGLDemo.py +57 -12
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/toolbar.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/debugger/configui.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/debugger/dbgcon.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/debugger/debugger.py +7 -8
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/debugger/fail.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/dialogs/ideoptions.py +7 -10
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/dialogs/list.py +11 -8
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/dialogs/login.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/docking/DockingBar.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/app.py +19 -22
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/dbgcommands.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/editor/ModuleBrowser.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/editor/__init__.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/editor/document.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/editor/editor.py +6 -6
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/editor/vss.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/help.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/interact.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/intpyapp.py +5 -7
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/intpydde.py +7 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/scriptutils.py +4 -6
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/sgrepmdi.py +13 -22
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/startup.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/stdin.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/toolmenu.py +0 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/idle/AutoIndent.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/idle/CallTips.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/mfc/activex.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/mfc/dialog.py +7 -10
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/IDLEenvironment.py +1 -5
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/bindings.py +4 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/config.py +3 -5
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/configui.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/document.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/formatter.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/keycodes.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/scintillacon.py +1178 -78
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/scintilla/view.py +17 -21
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/tools/browser.py +6 -18
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/tools/hierlist.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/_modified.py +26 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/_msvccompiler.py +2 -603
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/archive_util.py +48 -18
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/ccompiler.py +17 -1257
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/cmd.py +133 -41
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/bdist.py +19 -8
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/bdist_dumb.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/bdist_rpm.py +6 -5
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/build.py +8 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/build_clib.py +8 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/build_ext.py +32 -13
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/build_py.py +10 -9
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/build_scripts.py +3 -14
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/check.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/clean.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/config.py +1 -8
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/install.py +22 -19
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/install_data.py +4 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/install_headers.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/install_lib.py +11 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/install_scripts.py +4 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/command/sdist.py +22 -16
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compat/__init__.py +6 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compilers/C/base.py +1391 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compilers/C/cygwin.py +340 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compilers/C/errors.py +24 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compilers/C/msvc.py +614 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/{tests/test_ccompiler.py → compilers/C/tests/test_base.py} +9 -19
- py2docfx/venv/{basevenv/Lib/site-packages/setuptools/_distutils/tests/test_cygwinccompiler.py → venv1/Lib/site-packages/setuptools/_distutils/compilers/C/tests/test_cygwin.py} +7 -12
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/{tests/test_mingwccompiler.py → compilers/C/tests/test_mingw.py} +12 -20
- py2docfx/venv/{basevenv/Lib/site-packages/setuptools/_distutils/tests/test_msvccompiler.py → venv1/Lib/site-packages/setuptools/_distutils/compilers/C/tests/test_msvc.py} +11 -12
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/{tests/test_unixccompiler.py → compilers/C/tests/test_unix.py} +5 -5
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compilers/C/unix.py +409 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compilers/C/zos.py +230 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/cygwinccompiler.py +20 -328
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/dist.py +148 -80
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/errors.py +11 -27
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/extension.py +19 -16
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/filelist.py +80 -15
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/spawn.py +22 -5
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/sysconfig.py +32 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/tests/test_build_ext.py +13 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/tests/test_sdist.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/unixccompiler.py +2 -401
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/util.py +38 -23
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/zosccompiler.py +2 -228
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_static.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/editable_wheel.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/install.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/test_setupcfg.py +2 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_build_py.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/unicode_utils.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/EvtFormatMessage.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/EvtSubscribe_push.py +8 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/GetSaveFileName.py +8 -8
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/c_extension/setup.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/dde/ddeclient.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/dde/ddeserver.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/getfilever.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/pipes/runproc.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/rastest.py +4 -6
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/GetTokenInformation.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/account_rights.py +0 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/explicit_entries.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/get_policy_info.py +0 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/list_rights.py +0 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/localized_names.py +7 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/query_information.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/set_file_audit.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/set_file_owner.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/set_policy_info.py +0 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/setkernelobjectsecurity.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/setsecurityinfo.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/setuserobjectsecurity.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/sspi/fetch_url.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/sspi/simple_auth.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/security/sspi/socket_server.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/service/pipeTestService.py +10 -9
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/service/pipeTestServiceClient.py +6 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32clipboardDemo.py +17 -5
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32comport_demo.py +32 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32console_demo.py +1 -4
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32gui_devicenotify.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32gui_menu.py +60 -5
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32gui_taskbar.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32netdemo.py +2 -5
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32ts_logoff_disconnected.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/Demos/win32wnet/testwnet.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/commctrl.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/netbios.py +8 -10
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/pywin32_bootstrap.py +2 -10
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/pywin32_testutil.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/pywintypes.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/regutil.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/sspi.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win2kras.py +14 -7
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32con.py +16 -35
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32cryptcon.py +1 -4
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32evtlogutil.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32gui_struct.py +6 -6
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32pdhquery.py +10 -11
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32pdhutil.py +5 -5
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32rcparser.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32serviceutil.py +4 -6
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32timezone.py +304 -121
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/win32verstamp.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/winerror.py +4926 -604
- py2docfx/venv/venv1/Lib/site-packages/win32/lib/winxptheme.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/scripts/h2py.py +194 -0
- py2docfx/venv/venv1/Lib/site-packages/win32/scripts/pywin32_postinstall.py +733 -0
- py2docfx/venv/venv1/Lib/site-packages/win32/scripts/pywin32_testall.py +120 -0
- py2docfx/venv/venv1/Lib/site-packages/win32/scripts/regsetup.py +4 -7
- py2docfx/venv/venv1/Lib/site-packages/win32/scripts/setup_d.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/test/handles.py +13 -5
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_clipboard.py +12 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_sspi.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32api.py +8 -4
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32clipboard.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32cred.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32crypt.py +16 -3
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32file.py +24 -8
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32gui.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32guistruct.py +2 -5
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32inet.py +23 -6
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32net.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32/test/test_win32ts.py +19 -0
- py2docfx/venv/venv1/Lib/site-packages/win32/winxpgui.py +3 -11
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/CLSIDToClass.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/__init__.py +97 -65
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/build.py +24 -24
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/combrowse.py +17 -33
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/dynamic.py +14 -14
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/gencache.py +30 -12
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/genpy.py +50 -98
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/makepy.py +12 -8
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/selecttlb.py +3 -4
- py2docfx/venv/venv1/Lib/site-packages/win32com/client/util.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/demos/dump_clipboard.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/demos/excelAddin.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/demos/excelRTDServer.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/demos/iebutton.py +0 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/demos/ietoolbar.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/demos/outlookAddin.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/makegw/makegw.py +48 -56
- py2docfx/venv/venv1/Lib/site-packages/win32com/makegw/makegwenum.py +2 -6
- py2docfx/venv/venv1/Lib/site-packages/win32com/makegw/makegwparse.py +9 -11
- py2docfx/venv/venv1/Lib/site-packages/win32com/olectl.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/server/connect.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32com/server/dispatcher.py +20 -24
- py2docfx/venv/venv1/Lib/site-packages/win32com/server/exception.py +8 -8
- py2docfx/venv/venv1/Lib/site-packages/win32com/server/policy.py +4 -18
- py2docfx/venv/venv1/Lib/site-packages/win32com/server/register.py +5 -6
- py2docfx/venv/venv1/Lib/site-packages/win32com/servers/dictionary.py +2 -5
- py2docfx/venv/venv1/Lib/site-packages/win32com/servers/interp.py +7 -7
- py2docfx/venv/venv1/Lib/site-packages/win32com/servers/test_pycomtest.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/GenTestScripts.py +2 -4
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/errorSemantics.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/pippo_server.py +1 -4
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testADOEvents.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testAXScript.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testDictionary.py +4 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testDynamic.py +3 -5
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testExchange.py +2 -7
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testGatewayAddresses.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testIterators.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testMSOffice.py +40 -57
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testMSOfficeEvents.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testPersist.py +7 -7
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testPippo.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testPyComTest.py +143 -7
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testServers.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testall.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testmakepy.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testvb.py +12 -8
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/util.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/universal.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/win32com/util.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/adsi/demos/scp.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/adsi/demos/search.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/authorization/demos/EditSecurity.py +1 -24
- py2docfx/venv/venv1/Lib/site-packages/win32comext/authorization/demos/EditServiceSecurity.py +0 -20
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/adb.py +2 -8
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/codecontainer.py +16 -12
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/contexts.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/debugger.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/documents.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/dump.py +2 -4
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/expressions.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axdebug/util.py +7 -14
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/client/debug.py +2 -14
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/client/error.py +4 -5
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/client/framework.py +5 -5
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/client/pydumper.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/client/pyscript.py +5 -10
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/client/scriptdispatch.py +3 -4
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/server/axsite.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/test/leakTest.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/axscript/test/testHost4Dbg.py +0 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/bits/test/test_bits.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/ifilter/demo/filterDemo.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/mapi/demos/mapisend.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/mapi/emsabtags.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/win32comext/mapi/mapitags.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/mapi/mapiutil.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32comext/propsys/test/testpropsys.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/IFileOperationProgressSink.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/ITransferAdviseSink.py +5 -3
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/servers/column_provider.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/servers/copy_hook.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/servers/empty_volume_cache.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/servers/folder_view.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/servers/icon_handler.py +1 -2
- py2docfx/venv/venv1/Lib/site-packages/win32comext/shell/demos/servers/shell_view.py +4 -5
- py2docfx/venv/venv1/Lib/site-packages/win32comext/taskscheduler/test/test_addtask_2.py +0 -1
- py2docfx/venv/venv1/Scripts/pywin32_postinstall.py +77 -122
- py2docfx/venv/venv1/Scripts/pywin32_testall.py +4 -9
- {py2docfx-0.1.13.dev2016838.dist-info → py2docfx-0.1.13.dev2021865.dist-info}/METADATA +1 -1
- {py2docfx-0.1.13.dev2016838.dist-info → py2docfx-0.1.13.dev2021865.dist-info}/RECORD +342 -330
- py2docfx/venv/venv1/Lib/site-packages/docs/conf.py +0 -384
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/Demos/ocx/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/pythonwin/pywin/framework/mdi_pychecker.py +0 -850
- py2docfx/venv/venv1/Lib/site-packages/win32com/test/testNetscape.py +0 -24
- {py2docfx-0.1.13.dev2016838.dist-info → py2docfx-0.1.13.dev2021865.dist-info}/WHEEL +0 -0
- {py2docfx-0.1.13.dev2016838.dist-info → py2docfx-0.1.13.dev2021865.dist-info}/top_level.txt +0 -0
@@ -3,17 +3,12 @@
|
|
3
3
|
import os
|
4
4
|
import sys
|
5
5
|
from distutils import sysconfig
|
6
|
-
from distutils.cygwinccompiler import (
|
7
|
-
CONFIG_H_NOTOK,
|
8
|
-
CONFIG_H_OK,
|
9
|
-
CONFIG_H_UNCERTAIN,
|
10
|
-
check_config_h,
|
11
|
-
get_msvcr,
|
12
|
-
)
|
13
6
|
from distutils.tests import support
|
14
7
|
|
15
8
|
import pytest
|
16
9
|
|
10
|
+
from .. import cygwin
|
11
|
+
|
17
12
|
|
18
13
|
@pytest.fixture(autouse=True)
|
19
14
|
def stuff(request, monkeypatch, distutils_managed_tempdir):
|
@@ -54,24 +49,24 @@ class TestCygwinCCompiler(support.TempdirManager):
|
|
54
49
|
'4.0.1 (Apple Computer, Inc. build 5370)]'
|
55
50
|
)
|
56
51
|
|
57
|
-
assert check_config_h()[0] == CONFIG_H_OK
|
52
|
+
assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_OK
|
58
53
|
|
59
54
|
# then it tries to see if it can find "__GNUC__" in pyconfig.h
|
60
55
|
sys.version = 'something without the *CC word'
|
61
56
|
|
62
57
|
# if the file doesn't exist it returns CONFIG_H_UNCERTAIN
|
63
|
-
assert check_config_h()[0] == CONFIG_H_UNCERTAIN
|
58
|
+
assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_UNCERTAIN
|
64
59
|
|
65
60
|
# if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
|
66
61
|
self.write_file(self.python_h, 'xxx')
|
67
|
-
assert check_config_h()[0] == CONFIG_H_NOTOK
|
62
|
+
assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_NOTOK
|
68
63
|
|
69
64
|
# and CONFIG_H_OK if __GNUC__ is found
|
70
65
|
self.write_file(self.python_h, 'xxx __GNUC__ xxx')
|
71
|
-
assert check_config_h()[0] == CONFIG_H_OK
|
66
|
+
assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_OK
|
72
67
|
|
73
68
|
def test_get_msvcr(self):
|
74
|
-
assert get_msvcr() == []
|
69
|
+
assert cygwin.get_msvcr() == []
|
75
70
|
|
76
71
|
@pytest.mark.skipif('sys.platform != "cygwin"')
|
77
72
|
def test_dll_libraries_not_none(self):
|
@@ -1,26 +1,24 @@
|
|
1
1
|
from distutils import sysconfig
|
2
|
-
from distutils.errors import
|
2
|
+
from distutils.errors import DistutilsPlatformError
|
3
3
|
from distutils.util import is_mingw, split_quoted
|
4
4
|
|
5
5
|
import pytest
|
6
6
|
|
7
|
+
from .. import cygwin, errors
|
7
8
|
|
8
|
-
|
9
|
+
|
10
|
+
class TestMinGW32Compiler:
|
9
11
|
@pytest.mark.skipif(not is_mingw(), reason='not on mingw')
|
10
12
|
def test_compiler_type(self):
|
11
|
-
|
12
|
-
|
13
|
-
compiler = Mingw32CCompiler()
|
13
|
+
compiler = cygwin.MinGW32Compiler()
|
14
14
|
assert compiler.compiler_type == 'mingw32'
|
15
15
|
|
16
16
|
@pytest.mark.skipif(not is_mingw(), reason='not on mingw')
|
17
17
|
def test_set_executables(self, monkeypatch):
|
18
|
-
from distutils.cygwinccompiler import Mingw32CCompiler
|
19
|
-
|
20
18
|
monkeypatch.setenv('CC', 'cc')
|
21
19
|
monkeypatch.setenv('CXX', 'c++')
|
22
20
|
|
23
|
-
compiler =
|
21
|
+
compiler = cygwin.MinGW32Compiler()
|
24
22
|
|
25
23
|
assert compiler.compiler == split_quoted('cc -O -Wall')
|
26
24
|
assert compiler.compiler_so == split_quoted('cc -shared -O -Wall')
|
@@ -30,27 +28,21 @@ class TestMingw32CCompiler:
|
|
30
28
|
|
31
29
|
@pytest.mark.skipif(not is_mingw(), reason='not on mingw')
|
32
30
|
def test_runtime_library_dir_option(self):
|
33
|
-
|
34
|
-
|
35
|
-
compiler = Mingw32CCompiler()
|
31
|
+
compiler = cygwin.MinGW32Compiler()
|
36
32
|
with pytest.raises(DistutilsPlatformError):
|
37
33
|
compiler.runtime_library_dir_option('/usr/lib')
|
38
34
|
|
39
35
|
@pytest.mark.skipif(not is_mingw(), reason='not on mingw')
|
40
36
|
def test_cygwincc_error(self, monkeypatch):
|
41
|
-
|
42
|
-
|
43
|
-
monkeypatch.setattr(distutils.cygwinccompiler, 'is_cygwincc', lambda _: True)
|
37
|
+
monkeypatch.setattr(cygwin, 'is_cygwincc', lambda _: True)
|
44
38
|
|
45
|
-
with pytest.raises(
|
46
|
-
|
39
|
+
with pytest.raises(errors.Error):
|
40
|
+
cygwin.MinGW32Compiler()
|
47
41
|
|
48
42
|
@pytest.mark.skipif('sys.platform == "cygwin"')
|
49
43
|
def test_customize_compiler_with_msvc_python(self):
|
50
|
-
from distutils.cygwinccompiler import Mingw32CCompiler
|
51
|
-
|
52
44
|
# In case we have an MSVC Python build, but still want to use
|
53
|
-
#
|
45
|
+
# MinGW32Compiler, then customize_compiler() shouldn't fail at least.
|
54
46
|
# https://github.com/pypa/setuptools/issues/4456
|
55
|
-
compiler =
|
47
|
+
compiler = cygwin.MinGW32Compiler()
|
56
48
|
sysconfig.customize_compiler(compiler)
|
@@ -1,18 +1,17 @@
|
|
1
|
-
"""Tests for distutils._msvccompiler."""
|
2
|
-
|
3
1
|
import os
|
4
2
|
import sys
|
5
3
|
import sysconfig
|
6
4
|
import threading
|
7
5
|
import unittest.mock as mock
|
8
|
-
from distutils import _msvccompiler
|
9
6
|
from distutils.errors import DistutilsPlatformError
|
10
7
|
from distutils.tests import support
|
11
8
|
from distutils.util import get_platform
|
12
9
|
|
13
10
|
import pytest
|
14
11
|
|
15
|
-
|
12
|
+
from .. import msvc
|
13
|
+
|
14
|
+
needs_winreg = pytest.mark.skipif('not hasattr(msvc, "winreg")')
|
16
15
|
|
17
16
|
|
18
17
|
class Testmsvccompiler(support.TempdirManager):
|
@@ -23,10 +22,10 @@ class Testmsvccompiler(support.TempdirManager):
|
|
23
22
|
def _find_vcvarsall(plat_spec):
|
24
23
|
return None, None
|
25
24
|
|
26
|
-
monkeypatch.setattr(
|
25
|
+
monkeypatch.setattr(msvc, '_find_vcvarsall', _find_vcvarsall)
|
27
26
|
|
28
27
|
with pytest.raises(DistutilsPlatformError):
|
29
|
-
|
28
|
+
msvc._get_vc_env(
|
30
29
|
'wont find this version',
|
31
30
|
)
|
32
31
|
|
@@ -46,12 +45,12 @@ class Testmsvccompiler(support.TempdirManager):
|
|
46
45
|
"""
|
47
46
|
Ensure a specified target platform is passed to _get_vcvars_spec.
|
48
47
|
"""
|
49
|
-
compiler =
|
48
|
+
compiler = msvc.Compiler()
|
50
49
|
|
51
50
|
def _get_vcvars_spec(host_platform, platform):
|
52
51
|
assert platform == expected
|
53
52
|
|
54
|
-
monkeypatch.setattr(
|
53
|
+
monkeypatch.setattr(msvc, '_get_vcvars_spec', _get_vcvars_spec)
|
55
54
|
compiler.initialize(plat_name)
|
56
55
|
|
57
56
|
@needs_winreg
|
@@ -63,7 +62,7 @@ class Testmsvccompiler(support.TempdirManager):
|
|
63
62
|
old_distutils_use_sdk = os.environ.pop('DISTUTILS_USE_SDK', None)
|
64
63
|
os.environ[test_var] = test_value
|
65
64
|
try:
|
66
|
-
env =
|
65
|
+
env = msvc._get_vc_env('x86')
|
67
66
|
assert test_var.lower() in env
|
68
67
|
assert test_value == env[test_var.lower()]
|
69
68
|
finally:
|
@@ -76,7 +75,7 @@ class Testmsvccompiler(support.TempdirManager):
|
|
76
75
|
def test_get_vc(self, ver):
|
77
76
|
# This function cannot be mocked, so pass if VC is found
|
78
77
|
# and skip otherwise.
|
79
|
-
lookup = getattr(
|
78
|
+
lookup = getattr(msvc, f'_find_vc{ver}')
|
80
79
|
expected_version = {2015: 14, 2017: 15}[ver]
|
81
80
|
version, path = lookup()
|
82
81
|
if not version:
|
@@ -103,7 +102,7 @@ class TestSpawn:
|
|
103
102
|
"""
|
104
103
|
Concurrent calls to spawn should have consistent results.
|
105
104
|
"""
|
106
|
-
compiler =
|
105
|
+
compiler = msvc.Compiler()
|
107
106
|
compiler._paths = "expected"
|
108
107
|
inner_cmd = 'import os; assert os.environ["PATH"] == "expected"'
|
109
108
|
command = [sys.executable, '-c', inner_cmd]
|
@@ -124,7 +123,7 @@ class TestSpawn:
|
|
124
123
|
"""
|
125
124
|
from distutils import ccompiler
|
126
125
|
|
127
|
-
compiler =
|
126
|
+
compiler = msvc.Compiler()
|
128
127
|
compiler._paths = "expected"
|
129
128
|
|
130
129
|
def CCompiler_spawn(self, cmd):
|
@@ -6,13 +6,13 @@ import unittest.mock as mock
|
|
6
6
|
from distutils import sysconfig
|
7
7
|
from distutils.compat import consolidate_linker_args
|
8
8
|
from distutils.errors import DistutilsPlatformError
|
9
|
-
from distutils.
|
9
|
+
from distutils.tests import support
|
10
|
+
from distutils.tests.compat.py39 import EnvironmentVarGuard
|
10
11
|
from distutils.util import _clear_cached_macosx_ver
|
11
12
|
|
12
13
|
import pytest
|
13
14
|
|
14
|
-
from
|
15
|
-
from .compat.py39 import EnvironmentVarGuard
|
15
|
+
from .. import unix
|
16
16
|
|
17
17
|
|
18
18
|
@pytest.fixture(autouse=True)
|
@@ -24,7 +24,7 @@ def save_values(monkeypatch):
|
|
24
24
|
|
25
25
|
@pytest.fixture(autouse=True)
|
26
26
|
def compiler_wrapper(request):
|
27
|
-
class CompilerWrapper(
|
27
|
+
class CompilerWrapper(unix.Compiler):
|
28
28
|
def rpath_foo(self):
|
29
29
|
return self.runtime_library_dir_option('/foo')
|
30
30
|
|
@@ -320,7 +320,7 @@ class TestUnixCCompiler(support.TempdirManager):
|
|
320
320
|
self.cc.has_function('abort')
|
321
321
|
|
322
322
|
def test_find_library_file(self, monkeypatch):
|
323
|
-
compiler =
|
323
|
+
compiler = unix.Compiler()
|
324
324
|
compiler._library_root = lambda dir: dir
|
325
325
|
monkeypatch.setattr(os.path, 'exists', lambda d: 'existing' in d)
|
326
326
|
|
@@ -0,0 +1,409 @@
|
|
1
|
+
"""distutils.unixccompiler
|
2
|
+
|
3
|
+
Contains the UnixCCompiler class, a subclass of CCompiler that handles
|
4
|
+
the "typical" Unix-style command-line C compiler:
|
5
|
+
* macros defined with -Dname[=value]
|
6
|
+
* macros undefined with -Uname
|
7
|
+
* include search directories specified with -Idir
|
8
|
+
* libraries specified with -lllib
|
9
|
+
* library search directories specified with -Ldir
|
10
|
+
* compile handled by 'cc' (or similar) executable with -c option:
|
11
|
+
compiles .c to .o
|
12
|
+
* link static library handled by 'ar' command (possibly with 'ranlib')
|
13
|
+
* link shared library handled by 'cc -shared'
|
14
|
+
"""
|
15
|
+
|
16
|
+
from __future__ import annotations
|
17
|
+
|
18
|
+
import itertools
|
19
|
+
import os
|
20
|
+
import re
|
21
|
+
import shlex
|
22
|
+
import sys
|
23
|
+
from collections.abc import Iterable
|
24
|
+
|
25
|
+
from ... import sysconfig
|
26
|
+
from ..._log import log
|
27
|
+
from ..._macos_compat import compiler_fixup
|
28
|
+
from ..._modified import newer
|
29
|
+
from ...compat import consolidate_linker_args
|
30
|
+
from ...errors import DistutilsExecError
|
31
|
+
from . import base
|
32
|
+
from .base import _Macro, gen_lib_options, gen_preprocess_options
|
33
|
+
from .errors import (
|
34
|
+
CompileError,
|
35
|
+
LibError,
|
36
|
+
LinkError,
|
37
|
+
)
|
38
|
+
|
39
|
+
# XXX Things not currently handled:
|
40
|
+
# * optimization/debug/warning flags; we just use whatever's in Python's
|
41
|
+
# Makefile and live with it. Is this adequate? If not, we might
|
42
|
+
# have to have a bunch of subclasses GNUCCompiler, SGICCompiler,
|
43
|
+
# SunCCompiler, and I suspect down that road lies madness.
|
44
|
+
# * even if we don't know a warning flag from an optimization flag,
|
45
|
+
# we need some way for outsiders to feed preprocessor/compiler/linker
|
46
|
+
# flags in to us -- eg. a sysadmin might want to mandate certain flags
|
47
|
+
# via a site config file, or a user might want to set something for
|
48
|
+
# compiling this module distribution only via the setup.py command
|
49
|
+
# line, whatever. As long as these options come from something on the
|
50
|
+
# current system, they can be as system-dependent as they like, and we
|
51
|
+
# should just happily stuff them into the preprocessor/compiler/linker
|
52
|
+
# options and carry on.
|
53
|
+
|
54
|
+
|
55
|
+
def _split_env(cmd):
|
56
|
+
"""
|
57
|
+
For macOS, split command into 'env' portion (if any)
|
58
|
+
and the rest of the linker command.
|
59
|
+
|
60
|
+
>>> _split_env(['a', 'b', 'c'])
|
61
|
+
([], ['a', 'b', 'c'])
|
62
|
+
>>> _split_env(['/usr/bin/env', 'A=3', 'gcc'])
|
63
|
+
(['/usr/bin/env', 'A=3'], ['gcc'])
|
64
|
+
"""
|
65
|
+
pivot = 0
|
66
|
+
if os.path.basename(cmd[0]) == "env":
|
67
|
+
pivot = 1
|
68
|
+
while '=' in cmd[pivot]:
|
69
|
+
pivot += 1
|
70
|
+
return cmd[:pivot], cmd[pivot:]
|
71
|
+
|
72
|
+
|
73
|
+
def _split_aix(cmd):
|
74
|
+
"""
|
75
|
+
AIX platforms prefix the compiler with the ld_so_aix
|
76
|
+
script, so split that from the linker command.
|
77
|
+
|
78
|
+
>>> _split_aix(['a', 'b', 'c'])
|
79
|
+
([], ['a', 'b', 'c'])
|
80
|
+
>>> _split_aix(['/bin/foo/ld_so_aix', 'gcc'])
|
81
|
+
(['/bin/foo/ld_so_aix'], ['gcc'])
|
82
|
+
"""
|
83
|
+
pivot = os.path.basename(cmd[0]) == 'ld_so_aix'
|
84
|
+
return cmd[:pivot], cmd[pivot:]
|
85
|
+
|
86
|
+
|
87
|
+
def _linker_params(linker_cmd, compiler_cmd):
|
88
|
+
"""
|
89
|
+
The linker command usually begins with the compiler
|
90
|
+
command (possibly multiple elements), followed by zero or more
|
91
|
+
params for shared library building.
|
92
|
+
|
93
|
+
If the LDSHARED env variable overrides the linker command,
|
94
|
+
however, the commands may not match.
|
95
|
+
|
96
|
+
Return the best guess of the linker parameters by stripping
|
97
|
+
the linker command. If the compiler command does not
|
98
|
+
match the linker command, assume the linker command is
|
99
|
+
just the first element.
|
100
|
+
|
101
|
+
>>> _linker_params('gcc foo bar'.split(), ['gcc'])
|
102
|
+
['foo', 'bar']
|
103
|
+
>>> _linker_params('gcc foo bar'.split(), ['other'])
|
104
|
+
['foo', 'bar']
|
105
|
+
>>> _linker_params('ccache gcc foo bar'.split(), 'ccache gcc'.split())
|
106
|
+
['foo', 'bar']
|
107
|
+
>>> _linker_params(['gcc'], ['gcc'])
|
108
|
+
[]
|
109
|
+
"""
|
110
|
+
c_len = len(compiler_cmd)
|
111
|
+
pivot = c_len if linker_cmd[:c_len] == compiler_cmd else 1
|
112
|
+
return linker_cmd[pivot:]
|
113
|
+
|
114
|
+
|
115
|
+
class Compiler(base.Compiler):
|
116
|
+
compiler_type = 'unix'
|
117
|
+
|
118
|
+
# These are used by CCompiler in two places: the constructor sets
|
119
|
+
# instance attributes 'preprocessor', 'compiler', etc. from them, and
|
120
|
+
# 'set_executable()' allows any of these to be set. The defaults here
|
121
|
+
# are pretty generic; they will probably have to be set by an outsider
|
122
|
+
# (eg. using information discovered by the sysconfig about building
|
123
|
+
# Python extensions).
|
124
|
+
executables = {
|
125
|
+
'preprocessor': None,
|
126
|
+
'compiler': ["cc"],
|
127
|
+
'compiler_so': ["cc"],
|
128
|
+
'compiler_cxx': ["c++"],
|
129
|
+
'compiler_so_cxx': ["c++"],
|
130
|
+
'linker_so': ["cc", "-shared"],
|
131
|
+
'linker_so_cxx': ["c++", "-shared"],
|
132
|
+
'linker_exe': ["cc"],
|
133
|
+
'linker_exe_cxx': ["c++", "-shared"],
|
134
|
+
'archiver': ["ar", "-cr"],
|
135
|
+
'ranlib': None,
|
136
|
+
}
|
137
|
+
|
138
|
+
if sys.platform[:6] == "darwin":
|
139
|
+
executables['ranlib'] = ["ranlib"]
|
140
|
+
|
141
|
+
# Needed for the filename generation methods provided by the base
|
142
|
+
# class, CCompiler. NB. whoever instantiates/uses a particular
|
143
|
+
# UnixCCompiler instance should set 'shared_lib_ext' -- we set a
|
144
|
+
# reasonable common default here, but it's not necessarily used on all
|
145
|
+
# Unices!
|
146
|
+
|
147
|
+
src_extensions = [".c", ".C", ".cc", ".cxx", ".cpp", ".m"]
|
148
|
+
obj_extension = ".o"
|
149
|
+
static_lib_extension = ".a"
|
150
|
+
shared_lib_extension = ".so"
|
151
|
+
dylib_lib_extension = ".dylib"
|
152
|
+
xcode_stub_lib_extension = ".tbd"
|
153
|
+
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
|
154
|
+
xcode_stub_lib_format = dylib_lib_format
|
155
|
+
if sys.platform == "cygwin":
|
156
|
+
exe_extension = ".exe"
|
157
|
+
shared_lib_extension = ".dll.a"
|
158
|
+
dylib_lib_extension = ".dll"
|
159
|
+
dylib_lib_format = "cyg%s%s"
|
160
|
+
|
161
|
+
def preprocess(
|
162
|
+
self,
|
163
|
+
source: str | os.PathLike[str],
|
164
|
+
output_file: str | os.PathLike[str] | None = None,
|
165
|
+
macros: list[_Macro] | None = None,
|
166
|
+
include_dirs: list[str] | tuple[str, ...] | None = None,
|
167
|
+
extra_preargs: list[str] | None = None,
|
168
|
+
extra_postargs: Iterable[str] | None = None,
|
169
|
+
):
|
170
|
+
fixed_args = self._fix_compile_args(None, macros, include_dirs)
|
171
|
+
ignore, macros, include_dirs = fixed_args
|
172
|
+
pp_opts = gen_preprocess_options(macros, include_dirs)
|
173
|
+
pp_args = self.preprocessor + pp_opts
|
174
|
+
if output_file:
|
175
|
+
pp_args.extend(['-o', output_file])
|
176
|
+
if extra_preargs:
|
177
|
+
pp_args[:0] = extra_preargs
|
178
|
+
if extra_postargs:
|
179
|
+
pp_args.extend(extra_postargs)
|
180
|
+
pp_args.append(source)
|
181
|
+
|
182
|
+
# reasons to preprocess:
|
183
|
+
# - force is indicated
|
184
|
+
# - output is directed to stdout
|
185
|
+
# - source file is newer than the target
|
186
|
+
preprocess = self.force or output_file is None or newer(source, output_file)
|
187
|
+
if not preprocess:
|
188
|
+
return
|
189
|
+
|
190
|
+
if output_file:
|
191
|
+
self.mkpath(os.path.dirname(output_file))
|
192
|
+
|
193
|
+
try:
|
194
|
+
self.spawn(pp_args)
|
195
|
+
except DistutilsExecError as msg:
|
196
|
+
raise CompileError(msg)
|
197
|
+
|
198
|
+
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
|
199
|
+
compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs)
|
200
|
+
compiler_so_cxx = compiler_fixup(self.compiler_so_cxx, cc_args + extra_postargs)
|
201
|
+
try:
|
202
|
+
if self.detect_language(src) == 'c++':
|
203
|
+
self.spawn(
|
204
|
+
compiler_so_cxx + cc_args + [src, '-o', obj] + extra_postargs
|
205
|
+
)
|
206
|
+
else:
|
207
|
+
self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
|
208
|
+
except DistutilsExecError as msg:
|
209
|
+
raise CompileError(msg)
|
210
|
+
|
211
|
+
def create_static_lib(
|
212
|
+
self, objects, output_libname, output_dir=None, debug=False, target_lang=None
|
213
|
+
):
|
214
|
+
objects, output_dir = self._fix_object_args(objects, output_dir)
|
215
|
+
|
216
|
+
output_filename = self.library_filename(output_libname, output_dir=output_dir)
|
217
|
+
|
218
|
+
if self._need_link(objects, output_filename):
|
219
|
+
self.mkpath(os.path.dirname(output_filename))
|
220
|
+
self.spawn(self.archiver + [output_filename] + objects + self.objects)
|
221
|
+
|
222
|
+
# Not many Unices required ranlib anymore -- SunOS 4.x is, I
|
223
|
+
# think the only major Unix that does. Maybe we need some
|
224
|
+
# platform intelligence here to skip ranlib if it's not
|
225
|
+
# needed -- or maybe Python's configure script took care of
|
226
|
+
# it for us, hence the check for leading colon.
|
227
|
+
if self.ranlib:
|
228
|
+
try:
|
229
|
+
self.spawn(self.ranlib + [output_filename])
|
230
|
+
except DistutilsExecError as msg:
|
231
|
+
raise LibError(msg)
|
232
|
+
else:
|
233
|
+
log.debug("skipping %s (up-to-date)", output_filename)
|
234
|
+
|
235
|
+
def link(
|
236
|
+
self,
|
237
|
+
target_desc,
|
238
|
+
objects: list[str] | tuple[str, ...],
|
239
|
+
output_filename,
|
240
|
+
output_dir: str | None = None,
|
241
|
+
libraries: list[str] | tuple[str, ...] | None = None,
|
242
|
+
library_dirs: list[str] | tuple[str, ...] | None = None,
|
243
|
+
runtime_library_dirs: list[str] | tuple[str, ...] | None = None,
|
244
|
+
export_symbols=None,
|
245
|
+
debug=False,
|
246
|
+
extra_preargs=None,
|
247
|
+
extra_postargs=None,
|
248
|
+
build_temp=None,
|
249
|
+
target_lang=None,
|
250
|
+
):
|
251
|
+
objects, output_dir = self._fix_object_args(objects, output_dir)
|
252
|
+
fixed_args = self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
|
253
|
+
libraries, library_dirs, runtime_library_dirs = fixed_args
|
254
|
+
|
255
|
+
lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, libraries)
|
256
|
+
if not isinstance(output_dir, (str, type(None))):
|
257
|
+
raise TypeError("'output_dir' must be a string or None")
|
258
|
+
if output_dir is not None:
|
259
|
+
output_filename = os.path.join(output_dir, output_filename)
|
260
|
+
|
261
|
+
if self._need_link(objects, output_filename):
|
262
|
+
ld_args = objects + self.objects + lib_opts + ['-o', output_filename]
|
263
|
+
if debug:
|
264
|
+
ld_args[:0] = ['-g']
|
265
|
+
if extra_preargs:
|
266
|
+
ld_args[:0] = extra_preargs
|
267
|
+
if extra_postargs:
|
268
|
+
ld_args.extend(extra_postargs)
|
269
|
+
self.mkpath(os.path.dirname(output_filename))
|
270
|
+
try:
|
271
|
+
# Select a linker based on context: linker_exe when
|
272
|
+
# building an executable or linker_so (with shared options)
|
273
|
+
# when building a shared library.
|
274
|
+
building_exe = target_desc == base.Compiler.EXECUTABLE
|
275
|
+
linker = (
|
276
|
+
self.linker_exe
|
277
|
+
if building_exe
|
278
|
+
else (
|
279
|
+
self.linker_so_cxx if target_lang == "c++" else self.linker_so
|
280
|
+
)
|
281
|
+
)[:]
|
282
|
+
|
283
|
+
if target_lang == "c++" and self.compiler_cxx:
|
284
|
+
env, linker_ne = _split_env(linker)
|
285
|
+
aix, linker_na = _split_aix(linker_ne)
|
286
|
+
_, compiler_cxx_ne = _split_env(self.compiler_cxx)
|
287
|
+
_, linker_exe_ne = _split_env(self.linker_exe)
|
288
|
+
|
289
|
+
params = _linker_params(linker_na, linker_exe_ne)
|
290
|
+
linker = env + aix + compiler_cxx_ne + params
|
291
|
+
|
292
|
+
linker = compiler_fixup(linker, ld_args)
|
293
|
+
|
294
|
+
self.spawn(linker + ld_args)
|
295
|
+
except DistutilsExecError as msg:
|
296
|
+
raise LinkError(msg)
|
297
|
+
else:
|
298
|
+
log.debug("skipping %s (up-to-date)", output_filename)
|
299
|
+
|
300
|
+
# -- Miscellaneous methods -----------------------------------------
|
301
|
+
# These are all used by the 'gen_lib_options() function, in
|
302
|
+
# ccompiler.py.
|
303
|
+
|
304
|
+
def library_dir_option(self, dir):
|
305
|
+
return "-L" + dir
|
306
|
+
|
307
|
+
def _is_gcc(self):
|
308
|
+
cc_var = sysconfig.get_config_var("CC")
|
309
|
+
compiler = os.path.basename(shlex.split(cc_var)[0])
|
310
|
+
return "gcc" in compiler or "g++" in compiler
|
311
|
+
|
312
|
+
def runtime_library_dir_option(self, dir: str) -> str | list[str]:
|
313
|
+
# XXX Hackish, at the very least. See Python bug #445902:
|
314
|
+
# https://bugs.python.org/issue445902
|
315
|
+
# Linkers on different platforms need different options to
|
316
|
+
# specify that directories need to be added to the list of
|
317
|
+
# directories searched for dependencies when a dynamic library
|
318
|
+
# is sought. GCC on GNU systems (Linux, FreeBSD, ...) has to
|
319
|
+
# be told to pass the -R option through to the linker, whereas
|
320
|
+
# other compilers and gcc on other systems just know this.
|
321
|
+
# Other compilers may need something slightly different. At
|
322
|
+
# this time, there's no way to determine this information from
|
323
|
+
# the configuration data stored in the Python installation, so
|
324
|
+
# we use this hack.
|
325
|
+
if sys.platform[:6] == "darwin":
|
326
|
+
from distutils.util import get_macosx_target_ver, split_version
|
327
|
+
|
328
|
+
macosx_target_ver = get_macosx_target_ver()
|
329
|
+
if macosx_target_ver and split_version(macosx_target_ver) >= [10, 5]:
|
330
|
+
return "-Wl,-rpath," + dir
|
331
|
+
else: # no support for -rpath on earlier macOS versions
|
332
|
+
return "-L" + dir
|
333
|
+
elif sys.platform[:7] == "freebsd":
|
334
|
+
return "-Wl,-rpath=" + dir
|
335
|
+
elif sys.platform[:5] == "hp-ux":
|
336
|
+
return [
|
337
|
+
"-Wl,+s" if self._is_gcc() else "+s",
|
338
|
+
"-L" + dir,
|
339
|
+
]
|
340
|
+
|
341
|
+
# For all compilers, `-Wl` is the presumed way to pass a
|
342
|
+
# compiler option to the linker
|
343
|
+
if sysconfig.get_config_var("GNULD") == "yes":
|
344
|
+
return consolidate_linker_args([
|
345
|
+
# Force RUNPATH instead of RPATH
|
346
|
+
"-Wl,--enable-new-dtags",
|
347
|
+
"-Wl,-rpath," + dir,
|
348
|
+
])
|
349
|
+
else:
|
350
|
+
return "-Wl,-R" + dir
|
351
|
+
|
352
|
+
def library_option(self, lib):
|
353
|
+
return "-l" + lib
|
354
|
+
|
355
|
+
@staticmethod
|
356
|
+
def _library_root(dir):
|
357
|
+
"""
|
358
|
+
macOS users can specify an alternate SDK using'-isysroot'.
|
359
|
+
Calculate the SDK root if it is specified.
|
360
|
+
|
361
|
+
Note that, as of Xcode 7, Apple SDKs may contain textual stub
|
362
|
+
libraries with .tbd extensions rather than the normal .dylib
|
363
|
+
shared libraries installed in /. The Apple compiler tool
|
364
|
+
chain handles this transparently but it can cause problems
|
365
|
+
for programs that are being built with an SDK and searching
|
366
|
+
for specific libraries. Callers of find_library_file need to
|
367
|
+
keep in mind that the base filename of the returned SDK library
|
368
|
+
file might have a different extension from that of the library
|
369
|
+
file installed on the running system, for example:
|
370
|
+
/Applications/Xcode.app/Contents/Developer/Platforms/
|
371
|
+
MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/
|
372
|
+
usr/lib/libedit.tbd
|
373
|
+
vs
|
374
|
+
/usr/lib/libedit.dylib
|
375
|
+
"""
|
376
|
+
cflags = sysconfig.get_config_var('CFLAGS')
|
377
|
+
match = re.search(r'-isysroot\s*(\S+)', cflags)
|
378
|
+
|
379
|
+
apply_root = (
|
380
|
+
sys.platform == 'darwin'
|
381
|
+
and match
|
382
|
+
and (
|
383
|
+
dir.startswith('/System/')
|
384
|
+
or (dir.startswith('/usr/') and not dir.startswith('/usr/local/'))
|
385
|
+
)
|
386
|
+
)
|
387
|
+
|
388
|
+
return os.path.join(match.group(1), dir[1:]) if apply_root else dir
|
389
|
+
|
390
|
+
def find_library_file(self, dirs, lib, debug=False):
|
391
|
+
"""
|
392
|
+
Second-guess the linker with not much hard
|
393
|
+
data to go on: GCC seems to prefer the shared library, so
|
394
|
+
assume that *all* Unix C compilers do,
|
395
|
+
ignoring even GCC's "-static" option.
|
396
|
+
"""
|
397
|
+
lib_names = (
|
398
|
+
self.library_filename(lib, lib_type=type)
|
399
|
+
for type in 'dylib xcode_stub shared static'.split()
|
400
|
+
)
|
401
|
+
|
402
|
+
roots = map(self._library_root, dirs)
|
403
|
+
|
404
|
+
searched = itertools.starmap(os.path.join, itertools.product(roots, lib_names))
|
405
|
+
|
406
|
+
found = filter(os.path.exists, searched)
|
407
|
+
|
408
|
+
# Return None if it could not be found in any dir.
|
409
|
+
return next(found, None)
|