You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/06/30 19:48:36 UTC
(openoffice) 01/01: Python 3 migration: baseline 3.11.15, complete pyuno bridge and build files
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch python3-dev
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit debfef3b5b6eda8da33f448d2b60d080f2f86a22
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Jun 30 14:45:07 2026 -0400
Python 3 migration: baseline 3.11.15, complete pyuno bridge and build files
Migrate the bundled Python from 2.7.18 to 3.11.15 (Unix/macOS first;
Windows build deferred to a future modern-MSVC effort). This completes the
source- and build-level migration; only the full-tree build gate (link
pyuno against bundled libpython3.11, run a macro / bridgetest round-trip)
remains.
Version baseline:
- pyversion.mk, pyversion_dmake.mk: PYMAJOR/PYMINOR/PYMICRO -> 3/11/15.
pyuno C++ bridge (collapse the 2012 dual-version scaffolding to Py3-only):
- pyuno_util.cxx: ustring2PyUnicode/pyString2ustring use a single UTF-8
round-trip (PyUnicode_DecodeUTF8 / PyUnicode_AsUTF8AndSize); drop the
removed-in-3.12 Py_UNICODE_SIZE / PyUnicode_FromUnicode / AS_UNICODE paths.
Remove now-dead ustring2PyString.
- pyuno_type.cxx: PyUnicode_FromKindAndData for char; PyUnicode_GetLength /
PyUnicode_ReadChar instead of the 3.12-removed GetSize / AsUnicode.
- pyuno.cxx, pyuno_module.cxx, pyuno_runtime.cxx, pyuno_callable.cxx,
pyuno_except.cxx, pyuno_impl.hxx, pyuno_dlopenwrapper.c: remove all
PY_MAJOR_VERSION < 3 branches, PyInt_*, Py_InitModule, initpyuno, and the
PyEval_InitThreads() no-ops; PyInit_pyuno is the sole module entry point.
PyUnicode_AsUTF8 results are held as const char* (3.11 signature).
PyTypeObject initializers normalised to the unconditional Py3 layout.
configure.ac:
- AM_PATH_PYTHON([2.7]) -> ([3.11]); macOS hexversion floor 2.7.1 -> 3.11.0
(51118080); Py2 'print sys.version' -> print(); distutils.sysconfig ->
sysconfig (distutils removed in 3.12).
Bundled-Python build:
- makefile.mk: TARFILE_MD5 for Python-3.11.15; drop obsolete freebsd/ssl/
solaris patches; feed the solver's bundled OpenSSL to setup.py via
python_CFLAGS/python_LDFLAGS; guard (retain) the deferred Windows msvs9
blocks.
- Regenerated python-3.11.15-{sysbase,nohardlink}.patch and refreshed
python-md5.patch / python-solver-before-std.patch against 3.11.15. Removed
the orphaned 2.7.18 msvs9/sysbase/nohardlink and dead solaris patches.
- prj/d.lst: Py3.11 stdlib layout (drop Py2-only lib-old/compiler/hotshot/
plat-linux2/bsddb/lib-tk/config; python3.11 paths; libpython3.11.*).
pythonscript.py:
- Detect common Python 2 syntax in stored macros at compile() time and raise
a clear "port to Python 3" message instead of a bare SyntaxError traceback.
Verified on macOS arm64: bundled CPython 3.11.15 with these patches
configures, builds, and installs; _ssl/_hashlib/hashlib import and work; the
changed pyuno C-API patterns compile clean against real 3.11 headers
(-Wall -Wextra -Werror); all shipped .py files compile under 3.11.15.
---
main/configure.ac | 22 +-
main/python/makefile.mk | 69 +-
main/python/prj/d.lst | 159 +-
main/python/python-2.7.18-msvs9-dir.patch | 10 -
.../python-2.7.18-msvs9-no-host-python.patch | 11 -
main/python/python-2.7.18-msvs9-python-path.patch | 11 -
main/python/python-2.7.18-msvs9-subsystem.patch | 20 -
main/python/python-2.7.18-msvs9-win64-target.patch | 60 -
main/python/python-2.7.18-msvs9-win64.patch | 1731 --------------------
main/python/python-2.7.18-msvs9.patch | 1721 -------------------
main/python/python-2.7.18-nohardlink.patch | 11 -
main/python/python-3.11.15-nohardlink.patch | 11 +
...-sysbase.patch => python-3.11.15-sysbase.patch} | 8 +-
main/python/python-md5.patch | 34 +-
main/python/python-solaris.patch | 14 -
main/python/python-solver-before-std.patch | 117 +-
main/python/pyversion.mk | 4 +-
main/python/pyversion_dmake.mk | 4 +-
main/pyuno/source/loader/pyuno_loader.cxx | 6 -
main/pyuno/source/module/pyuno.cxx | 117 +-
main/pyuno/source/module/pyuno_callable.cxx | 10 +-
main/pyuno/source/module/pyuno_dlopenwrapper.c | 18 -
main/pyuno/source/module/pyuno_except.cxx | 4 -
main/pyuno/source/module/pyuno_impl.hxx | 7 -
main/pyuno/source/module/pyuno_module.cxx | 46 -
main/pyuno/source/module/pyuno_runtime.cxx | 54 +-
main/pyuno/source/module/pyuno_type.cxx | 32 -
main/pyuno/source/module/pyuno_util.cxx | 27 +-
main/scripting/source/pyprov/pythonscript.py | 46 +-
29 files changed, 234 insertions(+), 4150 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index 0d1c63104d..b5b4ffa3ec 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -4059,15 +4059,12 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
_python_hexversion=`$_python -c "import sys; print(sys.hexversion);"`
- dnl hex version of Python 2.7.1 = 34013680
- if test $_python_hexversion -ge 34013680 ; then
- _python_version=`$_python -c "import sys; print(sys.version);" | head -c 3`
+ dnl hex version of Python 3.11.0 = 51118080
+ if test $_python_hexversion -ge 51118080 ; then
+ _python_version=`$_python -c "import sys; print(sys.version);" | head -c 4`
AC_MSG_RESULT([compiling against system python (version $_python_version)])
- if ! $_python -c "import distutils.sysconfig;"; then
- AC_MSG_ERROR([python setuptools module is required to provide distutils for python >= 3.12])
- fi
- _python_ver=`$_python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+ _python_ver=`$_python -c "import sysconfig; print(sysconfig.get_config_var('VERSION'));"`
dnl Locate the headers. Prefer the framework/SDK locations, but fall
dnl back to whatever include dir the interpreter itself reports (this
@@ -4083,7 +4080,7 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
PYTHON_CFLAGS="-I$_python_inc"
fi
else
- AC_MSG_ERROR([Python 2.7.1 or higher is required])
+ AC_MSG_ERROR([Python 3.11 or higher is required])
fi
dnl A framework build links against the Python framework; any other
@@ -4101,13 +4098,10 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \
test "$with_system_python" != "no"; then
with_system_python=yes
AC_MSG_RESULT([external])
- AM_PATH_PYTHON([2.7])
+ AM_PATH_PYTHON([3.11])
- if ! $PYTHON -c "import distutils.sysconfig;"; then
- AC_MSG_ERROR([python setuptools module is required to provide distutils for python >= 3.12])
- fi
- python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
- python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+ python_include=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'));"`
+ python_version=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('VERSION'));"`
# Python 3.8 and later distinguish building Python modules from linking to the libpython:
# (https://bugs.python.org/issue36721)
if test "$python_version" -lt "3.8"; then
diff --git a/main/python/makefile.mk b/main/python/makefile.mk
index 4b1d01e1e8..042a4cf092 100644
--- a/main/python/makefile.mk
+++ b/main/python/makefile.mk
@@ -42,29 +42,33 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=38c84292658ed4456157195f1c9bcbe1
+TARFILE_MD5=57f84cbd92d478ceff55217d88a07ded
PATCH_FILES=\
- python-solaris.patch \
- python-freebsd.patch \
python-md5.patch \
- python-ssl.patch \
python-solver-before-std.patch \
python-$(PYVERSION)-sysbase.patch \
python-$(PYVERSION)-nohardlink.patch
-
-.IF "$(GUI)"=="WNT"
-.IF "$(CPUNAME)"=="INTEL"
-PATCH_FILES += python-$(PYVERSION)-msvs9.patch
-.ELIF "$(CPUNAME)"=="X86_64"
-PATCH_FILES += \
- python-$(PYVERSION)-msvs9-win64.patch \
- python-$(PYVERSION)-msvs9-win64-target.patch \
- python-$(PYVERSION)-msvs9-subsystem.patch \
- python-$(PYVERSION)-msvs9-dir.patch \
- python-$(PYVERSION)-msvs9-no-host-python.patch \
- python-$(PYVERSION)-msvs9-python-path.patch
-.ENDIF
-.ENDIF
+# python-freebsd.patch: all hunks obsolete in Python 3.11 (upstream fixes).
+# python-ssl.patch: dropped. Python 3.11's setup.py finds the bundled OpenSSL
+# through the compiler include/lib search paths instead of the old hard-coded
+# source edit; see python_CFLAGS/python_LDFLAGS in the UNX branch below.
+
+# Windows build deferred — Python 3 requires modern MSVC (VS2008/msvs9 not supported).
+# The msvs9 patch files below are retained for reference but are NOT applied until
+# the Windows toolchain is modernised. See python3 migration notes.
+#.IF "$(GUI)"=="WNT"
+#.IF "$(CPUNAME)"=="INTEL"
+#PATCH_FILES += python-$(PYVERSION)-msvs9.patch
+#.ELIF "$(CPUNAME)"=="X86_64"
+#PATCH_FILES += \
+# python-$(PYVERSION)-msvs9-win64.patch \
+# python-$(PYVERSION)-msvs9-win64-target.patch \
+# python-$(PYVERSION)-msvs9-subsystem.patch \
+# python-$(PYVERSION)-msvs9-dir.patch \
+# python-$(PYVERSION)-msvs9-no-host-python.patch \
+# python-$(PYVERSION)-msvs9-python-path.patch
+#.ENDIF
+#.ENDIF
CONFIGURE_DIR=
@@ -72,6 +76,15 @@ CONFIGURE_DIR=
BUILD_DIR=
MYCWD=$(shell @pwd)/$(INPATH)/misc/build
+# Point Python's setup.py at the bundled OpenSSL delivered to the solver.
+# (Replaces the old python-ssl.patch: Python 3.11 discovers _ssl/_hashlib via
+# the C compiler include/lib search paths, so feeding the solver's external
+# include dir and lib dir through CFLAGS/LDFLAGS is sufficient. Headers live
+# in $(SOLARINCDIR)/external/openssl/, so the search dir is .../external so
+# that setup.py's "openssl/ssl.h" probe resolves.)
+python_CFLAGS+=-I$(SOLARINCDIR)$/external
+python_LDFLAGS+=-L$(SOLARLIBDIR)
+
# CLFLAGS get overwritten in Makefile.pre.in
.IF "$(SYSBASE)"!=""
CC+:=-I$(SYSBASE)$/usr$/include
@@ -122,18 +135,14 @@ BUILD_ACTION=$(ENV_BUILD) make && make install
#.ENDIF #"$(WINDOWS_VISTA_PSDK)"!=""
#.ENDIF
-# Requires adapting for according to the MSVC compiler version.
-# Normally PCBuild will carry the latest supported build files.
-BUILD_DIR=PC/VS9.0
-
-# Build python executable and then runs a minimal script. Running the minimal script
-# ensures that certain *.pyc files are generated which would otherwise be created on
-# solver during registration in insetoo_native
-.IF "$(CPUNAME)"=="INTEL"
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32"
-.ELIF "$(CPUNAME)"=="X86_64"
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|x64"
-.ENDIF
+# Windows build deferred — Python 3 requires modern MSVC (PCbuild); VS9.0/vcbuild
+# no longer supported. Retained for reference. See python3 migration notes.
+#BUILD_DIR=PC/VS9.0
+#.IF "$(CPUNAME)"=="INTEL"
+#BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32"
+#.ELIF "$(CPUNAME)"=="X86_64"
+#BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|x64"
+#.ENDIF
.ENDIF
.ENDIF
diff --git a/main/python/prj/d.lst b/main/python/prj/d.lst
index 43f06b0c75..3a8d7d22c6 100644
--- a/main/python/prj/d.lst
+++ b/main/python/prj/d.lst
@@ -1,12 +1,8 @@
mkdir: %_DEST%\lib%_EXT%\python
-mkdir: %_DEST%\lib%_EXT%\python\lib-old
-mkdir: %_DEST%\lib%_EXT%\python\lib-tk
mkdir: %_DEST%\lib%_EXT%\python\site-packages
mkdir: %_DEST%\lib%_EXT%\python\encodings
mkdir: %_DEST%\lib%_EXT%\python\email
mkdir: %_DEST%\lib%_EXT%\python\email\mime
-mkdir: %_DEST%\lib%_EXT%\python\compiler
-mkdir: %_DEST%\lib%_EXT%\python\hotshot
mkdir: %_DEST%\lib%_EXT%\python\distutils
mkdir: %_DEST%\lib%_EXT%\python\distutils\command
mkdir: %_DEST%\lib%_EXT%\python\xml
@@ -15,10 +11,7 @@ mkdir: %_DEST%\lib%_EXT%\python\xml\parsers
mkdir: %_DEST%\lib%_EXT%\python\xml\sax
mkdir: %_DEST%\lib%_EXT%\python\xml\etree
mkdir: %_DEST%\lib%_EXT%\python\curses
-mkdir: %_DEST%\lib%_EXT%\python\plat-linux2
-mkdir: %_DEST%\lib%_EXT%\python\config
mkdir: %_DEST%\lib%_EXT%\python\lib-dynload
-mkdir: %_DEST%\lib%_EXT%\python\bsddb
mkdir: %_DEST%\lib%_EXT%\python\logging
mkdir: %_DEST%\lib%_EXT%\python\idlelib
mkdir: %_DEST%\lib%_EXT%\python\idlelib\Icons
@@ -34,99 +27,93 @@ mkdir: %_DEST%\lib%_EXT%\python\importlib
mkdir: %_DEST%\lib%_EXT%\python\multiprocessing
mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
mkdir: %_DEST%\lib%_EXT%\python\unittest
-mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
+mkdir: %_DEST%\lib%_EXT%\python\python3.11\config
-..\%__SRC%\misc\build\Python-2.7.18\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.18\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.18\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.18\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.18\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
-..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
+..\%__SRC%\misc\build\Python-3.11.15\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-3.11.15\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-3.11.15\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-3.11.15\Makefile %_DEST%\lib%_EXT%\python\python3.11\config\Makefile
+# TODO: _sysconfigdata filename is platform-mangled (e.g. _sysconfigdata__darwin_darwin.py on macOS,
+# _sysconfigdata__linux_x86_64-linux-gnu.py on Linux). Verify exact name from built tree.
+..\%__SRC%\misc\build\python-inst\lib\python3.11\_sysconfigdata*.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
..\pyversion_dmake.mk %_DEST%\inc%_EXT%\pyversion_dmake.mk
-..\%__SRC%\misc\build\Python-2.7.18\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-3.11.15\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.18\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
-..\%__SRC%\misc\build\python-inst\lib64\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
-..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
-..\%__SRC%\misc\build\python-inst\lib64\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
-symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so
+..\%__SRC%\misc\build\Python-3.11.15\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\python-inst\lib\python3.11\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
+..\%__SRC%\misc\build\python-inst\lib64\python3.11\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
+..\%__SRC%\misc\build\python-inst\bin\python3.11 %_DEST%\bin%_EXT%\python
+..\%__SRC%\misc\build\python-inst\lib\libpython3.11.so.1.0 %_DEST%\lib%_EXT%\libpython3.11.so.1.0
+..\%__SRC%\misc\build\python-inst\lib64\libpython3.11.so.1.0 %_DEST%\lib%_EXT%\libpython3.11.so.1.0
+symlink: %_DEST%\lib%_EXT%\libpython3.11.so.1.0 %_DEST%\lib%_EXT%\libpython3.11.so
# MacOS X
-..\%__SRC%\misc\build\python-inst\lib\libpython2.7.dylib %_DEST%\lib%_EXT%\libpython2.7.dylib
+..\%__SRC%\misc\build\python-inst\lib\libpython3.11.dylib %_DEST%\lib%_EXT%\libpython3.11.dylib
#MingW ONLY !
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.18\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-3.11.15\libpython3.11.dll %_DEST%\bin%_EXT%\libpython3.11.dll
-# WINDOWS ONLY !
+# WINDOWS ONLY ! Windows build deferred — Python 3 requires modern MSVC. Retained for reference.
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\python311.dll %_DEST%\bin%_EXT%\python311.dll
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\python311.lib %_DEST%\lib%_EXT%\python311.lib
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
-# Win64 ONLY!
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.18\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+# Win64 ONLY! Windows build deferred — see Windows ONLY comment above.
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\python311.dll %_DEST%\bin%_EXT%\python311.dll
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\python311.lib %_DEST%\lib%_EXT%\python311.lib
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-3.11.15\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
diff --git a/main/python/python-2.7.18-msvs9-dir.patch b/main/python/python-2.7.18-msvs9-dir.patch
deleted file mode 100644
index a4d29eb253..0000000000
--- a/main/python/python-2.7.18-msvs9-dir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:37:03.303029800 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:39:42.007110300 +0200
-@@ -120,6 +120,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ OutputFile="$(SolutionDir)/make_buildinfo.exe"
- AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- SubSystem="1"
- />
diff --git a/main/python/python-2.7.18-msvs9-no-host-python.patch b/main/python/python-2.7.18-msvs9-no-host-python.patch
deleted file mode 100644
index f4ef331dd4..0000000000
--- a/main/python/python-2.7.18-msvs9-no-host-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/build/Python-2.7.18/PC/VS9.0/x64.vsprops 2017-09-16 19:38:35.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/x64.vsprops 2018-03-08 07:04:52.320860000 +0200
-@@ -15,8 +15,4 @@
- Name="VCLinkerTool"
- TargetMachine="17"
- />
-- <UserMacro
-- Name="PythonExe"
-- Value="$(HOST_PYTHON)"
-- />
- </VisualStudioPropertySheet>
diff --git a/main/python/python-2.7.18-msvs9-python-path.patch b/main/python/python-2.7.18-msvs9-python-path.patch
deleted file mode 100644
index 6c09b36ff1..0000000000
--- a/main/python/python-2.7.18-msvs9-python-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/build/Python-2.7.18/PC/VS9.0/pyproject.vsprops 2017-09-16 19:38:35.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/pyproject.vsprops 2018-03-08 07:10:30.002138400 +0200
-@@ -42,7 +42,7 @@
- />
- <UserMacro
- Name="PythonExe"
-- Value="$(SolutionDir)\python.exe"
-+ Value="$(OutDir)\python.exe"
- />
- <UserMacro
- Name="externalsDir"
diff --git a/main/python/python-2.7.18-msvs9-subsystem.patch b/main/python/python-2.7.18-msvs9-subsystem.patch
deleted file mode 100644
index 36d82f6663..0000000000
--- a/main/python/python-2.7.18-msvs9-subsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 05:18:19.659192400 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 06:06:12.776404800 +0200
-@@ -137,6 +137,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ SubSystem="1"
- OutputFile="$(SolutionDir)make_versioninfo.exe"
- AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
---- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:21:48.081999200 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:23:02.210741600 +0200
-@@ -121,6 +121,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
-+ SubSystem="1"
- />
- <Tool
- Name="VCALinkTool"
diff --git a/main/python/python-2.7.18-msvs9-win64-target.patch b/main/python/python-2.7.18-msvs9-win64-target.patch
deleted file mode 100644
index 9e6bff4654..0000000000
--- a/main/python/python-2.7.18-msvs9-win64-target.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2018-03-08 04:58:56.323391400 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2018-03-08 05:14:36.079035700 +0200
-@@ -162,20 +162,20 @@
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
-@@ -226,20 +226,20 @@
- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64
- {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32
- {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32
- {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/main/python/python-2.7.18-msvs9-win64.patch b/main/python/python-2.7.18-msvs9-win64.patch
deleted file mode 100644
index b53c728827..0000000000
--- a/main/python/python-2.7.18-msvs9-win64.patch
+++ /dev/null
@@ -1,1731 +0,0 @@
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2025-01-01 13:31:13.583881000 +0200
-@@ -56,6 +56,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -120,6 +121,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -183,6 +185,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -248,6 +251,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -311,6 +315,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -375,6 +380,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-@@ -439,6 +445,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -503,6 +510,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2025-01-01 13:33:08.080013000 +0200
-@@ -177,7 +177,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -241,7 +241,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -304,7 +304,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -368,7 +368,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- TargetMachine="17"
-@@ -432,7 +432,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -496,7 +496,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- TargetMachine="17"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2025-01-01 13:34:51.168123000 +0200
-@@ -54,6 +54,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -113,6 +114,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -172,6 +174,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -232,6 +235,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -291,6 +295,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -352,6 +357,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -411,6 +417,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -472,6 +479,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2025-01-01 13:35:51.024211000 +0200
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2025-01-01 13:39:41.856375000 +0200
-@@ -57,7 +57,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -120,7 +121,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libcrypto.lib $(opensslDir)\out64\libssl.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -183,7 +185,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -247,7 +250,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libcrypto.lib $(opensslDir)\out64\libssl.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -310,7 +314,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -374,8 +379,9 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libcrypto.lib $(opensslDir)\out64\libssl.lib"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -438,7 +444,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -502,8 +509,9 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libcrypto.lib $(opensslDir)\out64\libssl.lib"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj 2025-01-01 13:40:49.688485000 +0200
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2025-01-01 13:41:32.696569000 +0200
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj 2025-01-01 13:42:20.160542000 +0200
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2025-01-01 13:43:01.648883000 +0200
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2025-01-01 13:46:39.368867000 +0200
-@@ -43,7 +43,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -57,7 +57,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -106,7 +107,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include64"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -120,7 +121,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -169,7 +171,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -183,7 +185,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -233,7 +236,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include64"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -247,7 +250,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,7 +300,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -310,7 +314,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -438,7 +443,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2025-01-01 13:47:18.992986000 +0200
-@@ -55,6 +55,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -115,6 +116,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -175,6 +177,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -236,6 +239,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,6 +300,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -358,6 +363,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -418,6 +424,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -480,6 +487,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2025-01-01 13:48:05.184979000 +0200
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLibDebug)"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64LibDebug)"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2025-01-01 13:48:50.641267000 +0200
-@@ -81,8 +81,7 @@
- IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
- SubSystem="2"
-- RandomizedBaseAddress="1"
-- DataExecutionPrevention="0"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- TargetMachine="1"
- />
- <Tool
-@@ -171,8 +170,7 @@
- IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
- SubSystem="2"
-- RandomizedBaseAddress="1"
-- DataExecutionPrevention="0"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- TargetMachine="17"
- />
- <Tool
-diff --git misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj 2025-01-01 13:49:31.585319000 +0200
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2025-01-01 13:50:05.649209000 +0200
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.exe"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.exe"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -177,6 +179,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -238,6 +241,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2025-01-01 13:50:32.305199000 +0200
-@@ -61,6 +61,7 @@
- OutputFile="$(OutDir)/make_buildinfo.exe"
- ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2025-01-01 13:51:11.089246000 +0200
-@@ -71,6 +71,7 @@
- ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- SubSystem="1"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -137,6 +138,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(SolutionDir)make_versioninfo.exe"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -214,6 +216,7 @@
- ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- SubSystem="1"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -282,6 +285,7 @@
- Name="VCLinkerTool"
- OutputFile="$(SolutionDir)make_versioninfo_d.exe"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
---- misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2025-01-01 13:25:56.029553000 +0200
-@@ -38,12 +38,12 @@
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-- ProjectSection(ProjectDependencies) = postProject
-- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -69,12 +69,12 @@
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-@@ -87,16 +87,16 @@
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -114,17 +114,17 @@
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-- ProjectSection(ProjectDependencies) = postProject
-- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-- ProjectSection(ProjectDependencies) = postProject
-- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2025-01-01 13:52:10.929396000 +0200
-@@ -56,6 +56,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/python.vcproj misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/python.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/python.vcproj 2025-01-01 13:53:46.697447000 +0200
-@@ -66,6 +66,7 @@
- SubSystem="1"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -139,6 +140,7 @@
- SubSystem="1"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -213,6 +215,7 @@
- SubSystem="1"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -288,6 +291,7 @@
- SubSystem="1"
- StackReserveSize="2100000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -361,6 +365,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- ImportLibrary=""
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -436,6 +441,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -509,6 +515,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- ImportLibrary=""
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -584,6 +591,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2025-01-01 13:54:45.577681000 +0200
-@@ -69,6 +69,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName).lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -144,6 +145,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName).lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -222,6 +224,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -300,6 +303,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -374,6 +378,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -450,6 +455,7 @@
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -524,6 +530,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -600,6 +607,7 @@
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2025-01-01 13:55:29.753587000 +0200
-@@ -66,6 +66,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- TargetMachine="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -137,6 +138,7 @@
- OutputFile="$(OutDir)\pythonw_d.exe"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -208,6 +210,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- TargetMachine="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -279,6 +282,7 @@
- OutputFile="$(OutDir)\pythonw.exe"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -351,6 +355,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -424,6 +429,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +502,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -569,6 +576,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/select.vcproj misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/select.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/select.vcproj 2025-01-01 13:56:02.521672000 +0200
-@@ -57,6 +57,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2025-01-01 13:56:47.281717000 +0200
-@@ -56,6 +56,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -362,6 +367,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -423,6 +429,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -484,6 +491,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2025-01-01 13:57:22.673838000 +0200
-@@ -55,6 +55,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -115,6 +116,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -175,6 +177,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -236,6 +239,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,6 +300,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -358,6 +363,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -418,6 +424,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -480,6 +487,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2025-01-01 13:58:00.425798000 +0200
-@@ -59,6 +59,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -124,6 +125,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -191,6 +193,7 @@
- Name="VCLinkerTool"
- GenerateDebugInformation="false"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -259,6 +262,7 @@
- Name="VCLinkerTool"
- GenerateDebugInformation="false"
- SubSystem="1"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -327,6 +331,7 @@
- GenerateDebugInformation="false"
- SubSystem="1"
- ImportLibrary=""
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -397,6 +402,7 @@
- SubSystem="1"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -465,6 +471,7 @@
- GenerateDebugInformation="false"
- SubSystem="1"
- ImportLibrary=""
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -535,6 +542,7 @@
- SubSystem="1"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj 2020-04-19 23:13:39.000000000 +0200
-+++ misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj 2025-01-01 13:58:38.665819000 +0200
-@@ -55,6 +55,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -115,6 +116,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -175,6 +177,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -236,6 +239,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,6 +300,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -358,6 +363,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -418,6 +424,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -480,6 +487,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
- TargetMachine="17"
-+ AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
diff --git a/main/python/python-2.7.18-msvs9.patch b/main/python/python-2.7.18-msvs9.patch
deleted file mode 100644
index ba6b3d85e3..0000000000
--- a/main/python/python-2.7.18-msvs9.patch
+++ /dev/null
@@ -1,1721 +0,0 @@
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
-@@ -56,6 +56,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -120,6 +121,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -183,6 +185,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -248,6 +251,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -311,6 +315,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -375,6 +380,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-@@ -439,6 +445,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- />
-@@ -503,6 +510,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- AdditionalDependencies="$(bsddbDepLibs)"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
-@@ -177,7 +177,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -241,7 +241,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -304,7 +304,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -368,7 +368,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- TargetMachine="17"
-@@ -432,7 +432,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- />
-@@ -496,7 +496,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-+ AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
- SubSystem="0"
- BaseAddress="0x1D1A0000"
- TargetMachine="17"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
-@@ -54,6 +54,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -113,6 +114,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -172,6 +174,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -232,6 +235,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -291,6 +295,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -352,6 +357,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -411,6 +417,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -472,6 +479,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D100000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
-@@ -57,7 +57,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -121,6 +122,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -183,7 +185,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -248,6 +251,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -310,7 +314,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -376,6 +381,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -438,7 +444,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -504,6 +511,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
- BaseAddress="0x1D160000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- AdditionalDependencies="ws2_32.lib"
- BaseAddress="0x1e1D0000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
---- misc/build/Python-2.7.18PC/VS9.0/_sqlite3.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e180000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
-@@ -43,7 +43,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -57,7 +57,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -106,7 +107,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include64"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -120,7 +121,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -169,7 +171,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -183,7 +185,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -233,7 +236,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include64"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -247,7 +250,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,7 +300,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\include32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -310,7 +314,8 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-@@ -438,7 +443,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
-@@ -55,6 +55,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -115,6 +116,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -175,6 +177,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -236,6 +239,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,6 +300,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -358,6 +363,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -418,6 +424,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -480,6 +487,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1e1F0000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
---- misc/build/Python-2.7.18PC/VS9.0/_tkinter.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLibDebug)"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64LibDebug)"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
-@@ -81,8 +81,7 @@
- IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
- SubSystem="2"
-- RandomizedBaseAddress="1"
-- DataExecutionPrevention="0"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- TargetMachine="1"
- />
- <Tool
-@@ -171,8 +170,7 @@
- IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
- SubSystem="2"
-- RandomizedBaseAddress="1"
-- DataExecutionPrevention="0"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- TargetMachine="17"
- />
- <Tool
-diff --git misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
-@@ -57,6 +57,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D170000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
-@@ -56,6 +56,7 @@
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.exe"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.exe"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -177,6 +179,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -238,6 +241,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
-@@ -61,6 +61,7 @@
- OutputFile="$(OutDir)/make_buildinfo.exe"
- ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
-@@ -71,6 +71,7 @@
- ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- SubSystem="1"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -137,6 +138,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(SolutionDir)make_versioninfo.exe"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -214,6 +216,7 @@
- ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- SubSystem="1"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -282,6 +285,7 @@
- Name="VCLinkerTool"
- OutputFile="$(SolutionDir)make_versioninfo_d.exe"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
---- misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
-+++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
-@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-- ProjectSection(ProjectDependencies) = postProject
-- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -69,12 +69,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj",
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-@@ -87,16 +87,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcpr
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -114,17 +114,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj",
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-- ProjectSection(ProjectDependencies) = postProject
-- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-- ProjectSection(ProjectDependencies) = postProject
-- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-- EndProjectSection
--EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+# EndProjectSection
-+#EndProject
-+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-+# ProjectSection(ProjectDependencies) = postProject
-+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+# EndProjectSection
-+#EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
-@@ -56,6 +56,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -364,6 +369,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -425,6 +431,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -488,6 +495,7 @@
- <Tool
- Name="VCLinkerTool"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/python.vcproj misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
-@@ -66,6 +66,7 @@
- SubSystem="1"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -139,6 +140,7 @@
- SubSystem="1"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -213,6 +215,7 @@
- SubSystem="1"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -288,6 +291,7 @@
- SubSystem="1"
- StackReserveSize="2100000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -361,6 +365,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- ImportLibrary=""
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -436,6 +441,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -509,6 +515,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- ImportLibrary=""
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -584,6 +591,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
-@@ -69,6 +69,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName).lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -144,6 +145,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName).lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -222,6 +224,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -300,6 +303,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -374,6 +378,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -450,6 +455,7 @@
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -524,6 +530,7 @@
- ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -600,6 +607,7 @@
- BaseAddress="0x1e000000"
- ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
-@@ -66,6 +66,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- TargetMachine="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -137,6 +138,7 @@
- OutputFile="$(OutDir)\pythonw_d.exe"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -208,6 +210,7 @@
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
- TargetMachine="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -279,6 +282,7 @@
- OutputFile="$(OutDir)\pythonw.exe"
- StackReserveSize="2000000"
- BaseAddress="0x1d000000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -351,6 +355,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -424,6 +429,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +502,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -569,6 +576,7 @@
- BaseAddress="0x1d000000"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/select.vcproj misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
-@@ -57,6 +57,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -119,6 +120,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -181,6 +183,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -244,6 +247,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -306,6 +310,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -370,6 +375,7 @@
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -432,6 +438,7 @@
- AdditionalDependencies="ws2_32.lib"
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -496,6 +503,7 @@
- IgnoreDefaultLibraryNames="libc"
- BaseAddress="0x1D110000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
-@@ -56,6 +56,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -117,6 +118,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -178,6 +180,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -240,6 +243,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -301,6 +305,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -362,6 +367,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -423,6 +429,7 @@
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).dll"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -484,6 +491,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
-@@ -55,6 +55,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -115,6 +116,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -175,6 +177,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -236,6 +239,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,6 +300,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -358,6 +363,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -418,6 +424,7 @@
- <Tool
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -480,6 +487,7 @@
- Name="VCLinkerTool"
- BaseAddress="0x1D120000"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
-@@ -59,6 +59,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -124,6 +125,7 @@
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -191,6 +193,7 @@
- Name="VCLinkerTool"
- GenerateDebugInformation="false"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -259,6 +262,7 @@
- Name="VCLinkerTool"
- GenerateDebugInformation="false"
- SubSystem="1"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -327,6 +331,7 @@
- GenerateDebugInformation="false"
- SubSystem="1"
- ImportLibrary=""
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -397,6 +402,7 @@
- SubSystem="1"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -465,6 +471,7 @@
- GenerateDebugInformation="false"
- SubSystem="1"
- ImportLibrary=""
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -535,6 +542,7 @@
- SubSystem="1"
- ImportLibrary=""
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-diff --git misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
---- misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
-+++ misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
-@@ -55,6 +55,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -115,6 +116,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -175,6 +177,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -236,6 +239,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -296,6 +300,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -358,6 +363,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -418,6 +424,7 @@
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
-@@ -480,6 +487,7 @@
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib"
- TargetMachine="17"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
- />
- <Tool
- Name="VCALinkTool"
diff --git a/main/python/python-2.7.18-nohardlink.patch b/main/python/python-2.7.18-nohardlink.patch
deleted file mode 100644
index 4405b92c6c..0000000000
--- a/main/python/python-2.7.18-nohardlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/Python-2.7.18/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.18/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
-@@ -542,7 +542,7 @@
- libpython$(VERSION).so: $(LIBRARY_OBJS)
- if test $(INSTSONAME) != $(LDLIBRARY); then \
- $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-- $(LN) -f $(INSTSONAME) $@; \
-+ $(LN) -fs $(INSTSONAME) $@; \
- else \
- $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
- fi
diff --git a/main/python/python-3.11.15-nohardlink.patch b/main/python/python-3.11.15-nohardlink.patch
new file mode 100644
index 0000000000..2b8f8eee6c
--- /dev/null
+++ b/main/python/python-3.11.15-nohardlink.patch
@@ -0,0 +1,11 @@
+--- misc/Python-3.11.15/Makefile.pre.in 2025-01-01 00:00:00.000000000 +0000
++++ misc/build/Python-3.11.15/Makefile.pre.in 2025-01-01 00:00:00.000000000 +0000
+@@ -759,7 +759,7 @@
+ libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
+ if test $(INSTSONAME) != $(LDLIBRARY); then \
+ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
+- $(LN) -f $(INSTSONAME) $@; \
++ $(LN) -fs $(INSTSONAME) $@; \
+ else \
+ $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
+ fi
diff --git a/main/python/python-2.7.18-sysbase.patch b/main/python/python-3.11.15-sysbase.patch
similarity index 57%
rename from main/python/python-2.7.18-sysbase.patch
rename to main/python/python-3.11.15-sysbase.patch
index da3503aad6..152d14fd29 100644
--- a/main/python/python-2.7.18-sysbase.patch
+++ b/main/python/python-3.11.15-sysbase.patch
@@ -1,7 +1,7 @@
-diff -ruN misc/Python-2.7.18/configure misc/build/Python-2.7.18/configure
---- misc/Python-2.7.18/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.18/configure 2016-01-01 15:18:37.398344671 -0500
-@@ -3295,7 +3295,9 @@
+diff -ruN misc/Python-3.11.15/configure misc/build/Python-3.11.15/configure
+--- misc/Python-3.11.15/configure 2025-01-01 00:00:00.000000000 +0000
++++ misc/build/Python-3.11.15/configure 2025-01-01 00:00:00.000000000 +0000
+@@ -3840,7 +3840,9 @@
ac_sys_release=
else
ac_sys_system=`uname -s`
diff --git a/main/python/python-md5.patch b/main/python/python-md5.patch
index 0cb3b7d277..ee5134d38d 100644
--- a/main/python/python-md5.patch
+++ b/main/python/python-md5.patch
@@ -1,22 +1,20 @@
-diff -ru misc/Python-2.7.18/Modules/Setup.dist misc/build/Python-2.7.18/Modules/Setup.dist
---- misc/Python-2.7.18/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.18/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
-@@ -252,14 +252,14 @@
- # Message-Digest Algorithm, described in RFC 1321. The necessary files
- # md5.c and md5.h are included here.
-
--#_md5 md5module.c md5.c
-+_md5 md5module.c md5.c
-
-
- # The _sha module implements the SHA checksum algorithms.
- # (NIST's Secure Hash Algorithms.)
--#_sha shamodule.c
+diff -ru misc/Python-3.11.15/Modules/Setup misc/build/Python-3.11.15/Modules/Setup
+--- misc/Python-3.11.15/Modules/Setup 2025-01-01 00:00:00.000000000 +0000
++++ misc/build/Python-3.11.15/Modules/Setup 2025-01-01 00:00:00.000000000 +0000
+@@ -163,11 +163,11 @@
+
+ # hashing builtins
+ #_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
+-#_md5 md5module.c
+-#_sha1 sha1module.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
-+_sha shamodule.c
+-#_sha3 _sha3/sha3module.c
++_md5 md5module.c
++_sha1 sha1module.c
+_sha256 sha256module.c
+_sha512 sha512module.c
-
-
- # SGI IRIX specific modules -- off by default.
++_sha3 _sha3/sha3module.c
+
+ # text encodings and unicode
+ #_codecs_cn cjkcodecs/_codecs_cn.c
diff --git a/main/python/python-solaris.patch b/main/python/python-solaris.patch
deleted file mode 100644
index a4d0f2a916..0000000000
--- a/main/python/python-solaris.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/Python-2.7.18/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.18/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
-@@ -640,11 +640,6 @@
- in platform-specific #ifdefs.
- **************************************************************************/
-
--#ifdef SOLARIS
--/* Unchecked */
--extern int gethostname(char *, int);
--#endif
--
- #ifdef __BEOS__
- /* Unchecked */
- /* It's in the libs, but not the headers... - [cjh] */
diff --git a/main/python/python-solver-before-std.patch b/main/python/python-solver-before-std.patch
index ec77cc4985..64c3c9d4db 100644
--- a/main/python/python-solver-before-std.patch
+++ b/main/python/python-solver-before-std.patch
@@ -1,100 +1,35 @@
-diff -ur misc/Python-2.7.18/setup.py misc/build/Python-2.7.18/setup.py
---- misc/Python-2.7.18/setup.py 2016-06-25 16:49:32.000000000 -0500
-+++ misc/build/Python-2.7.18/setup.py 2016-09-02 17:09:20.687419000 -0500
-@@ -126,39 +126,41 @@
+diff -ur misc/Python-3.11.15/setup.py misc/build/Python-3.11.15/setup.py
+--- misc/Python-3.11.15/setup.py 2025-01-01 00:00:00.000000000 +0000
++++ misc/build/Python-3.11.15/setup.py 2025-01-01 00:00:00.000000000 +0000
+@@ -248,24 +248,24 @@
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()
-
+
- # Check the standard locations
-- for dir in std_dirs:
-+ # Check the standard directories
-+ for dir in paths:
- f = os.path.join(dir, filename)
-
- if host_platform == 'darwin' and is_macosx_sdk_path(dir):
- f = os.path.join(sysroot, dir[1:], filename)
-
+- for dir_ in std_dirs:
++ # Check the additional directories (solver paths take priority)
++ for dir_ in paths:
+ f = os.path.join(dir_, filename)
+
+ if MACOS and is_macosx_sdk_path(dir_):
+ f = os.path.join(sysroot, dir_[1:], filename)
+
- if os.path.exists(f): return []
+ if os.path.exists(f):
-+ return [dir]
-
++ return [dir_]
+
- # Check the additional directories
-- for dir in paths:
+- for dir_ in paths:
+ # Check the standard locations
-+ for dir in std_dirs:
- f = os.path.join(dir, filename)
-
- if host_platform == 'darwin' and is_macosx_sdk_path(dir):
- f = os.path.join(sysroot, dir[1:], filename)
-
- if os.path.exists(f):
-- return [dir]
-+ return []
-
++ for dir_ in std_dirs:
+ f = os.path.join(dir_, filename)
+
+ if MACOS and is_macosx_sdk_path(dir_):
+ f = os.path.join(sysroot, dir_[1:], filename)
+
+- if os.path.exists(f):
+- return [dir_]
++ if os.path.exists(f): return []
+
# Not found anywhere
return None
-
- def find_library_file(compiler, libname, std_dirs, paths):
-- result = compiler.find_library_file(std_dirs + paths, libname)
-+ result = compiler.find_library_file(paths+std_dirs, libname)
- if result is None:
- return None
-
- if host_platform == 'darwin':
- sysroot = macosx_sdk_root()
-
-- # Check whether the found file is in one of the standard directories
- dirname = os.path.dirname(result)
-- for p in std_dirs:
-+ # Otherwise, it must have been in one of the additional directories,
-+ # so we have to figure out which one.
-+ for p in paths:
- # Ensure path doesn't end with path separator
- p = p.rstrip(os.sep)
-
-@@ -180,23 +180,22 @@
- # vs
- # /usr/lib/libedit.dylib
- if os.path.join(sysroot, p[1:]) == dirname:
-- return [ ]
-+ return [ p ]
-
- if p == dirname:
-- return [ ]
-+ return [ p ]
-
-- # Otherwise, it must have been in one of the additional directories,
-- # so we have to figure out which one.
-- for p in paths:
-+ # Check whether the found file is in one of the standard directories
-+ for p in std_dirs:
- # Ensure path doesn't end with path separator
- p = p.rstrip(os.sep)
-
- if host_platform == 'darwin' and is_macosx_sdk_path(p):
- if os.path.join(sysroot, p[1:]) == dirname:
-- return [ p ]
-+ return [ ]
-
- if p == dirname:
-- return [p]
-+ return [ ]
- else:
- assert False, "Internal error: Path not found in std_dirs or paths"
-
-@@ -891,6 +892,7 @@
- exts.append( Extension('_ssl', ['_ssl.c'],
- include_dirs = ssl_incs,
- library_dirs = ssl_libs,
-+ extra_link_args = ['-Wl,--exclude-libs,ALL'],
- libraries = ['ssl', 'crypto'],
- depends = ['socketmodule.h']), )
- else:
-@@ -930,6 +931,7 @@
- exts.append( Extension('_hashlib', ['_hashopenssl.c'],
- include_dirs = ssl_incs,
- library_dirs = ssl_libs,
-+ extra_link_args = ['-Wl,--exclude-libs,ALL'],
- libraries = ['ssl', 'crypto']) )
- else:
- print ("warning: openssl 0x%08x is too old for _hashlib" %
diff --git a/main/python/pyversion.mk b/main/python/pyversion.mk
index 95f7b299da..e18f69beb2 100644
--- a/main/python/pyversion.mk
+++ b/main/python/pyversion.mk
@@ -21,8 +21,8 @@
# when you want to change the python version, you must update the d.lst
# in the python project accordingly !!!
PYMAJOR=3
-PYMINOR=10
-PYMICRO=18
+PYMINOR=11
+PYMICRO=15
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
ifeq ($(GUI),UNX)
diff --git a/main/python/pyversion_dmake.mk b/main/python/pyversion_dmake.mk
index b8252a9767..393778f25a 100644
--- a/main/python/pyversion_dmake.mk
+++ b/main/python/pyversion_dmake.mk
@@ -21,8 +21,8 @@
# when you want to change the python version, you must update the d.lst
# in the python project accordingly !!!
PYMAJOR=3
-PYMINOR=10
-PYMICRO=18
+PYMINOR=11
+PYMICRO=15
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
diff --git a/main/pyuno/source/loader/pyuno_loader.cxx b/main/pyuno/source/loader/pyuno_loader.cxx
index b3cb764190..294fcdfcd4 100644
--- a/main/pyuno/source/loader/pyuno_loader.cxx
+++ b/main/pyuno/source/loader/pyuno_loader.cxx
@@ -113,17 +113,12 @@ static void setPythonHome ( const OUString & pythonHome )
OUString systemPythonHome;
osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
-#if PY_MAJOR_VERSION < 3 || PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 4
- rtl_string_acquire(o.pData); // leak this string (that's the api!)
- Py_SetPythonHome( o.pData->buffer);
-#else
static wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
if (wpath == NULL) {
PyErr_SetString(PyExc_SystemError, "Cannot decode python home path");
return;
}
Py_SetPythonHome(wpath);
-#endif
}
static void prependPythonPath( const OUString & pythonPathBootstrap )
@@ -185,7 +180,6 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
// initialize python
Py_Initialize();
- PyEval_InitThreads();
PyThreadState *tstate = PyThreadState_Get();
PyEval_ReleaseThread( tstate );
diff --git a/main/pyuno/source/module/pyuno.cxx b/main/pyuno/source/module/pyuno.cxx
index ba4023795d..4886689263 100644
--- a/main/pyuno/source/module/pyuno.cxx
+++ b/main/pyuno/source/module/pyuno.cxx
@@ -442,56 +442,23 @@ PyObject *PyUNO_str( PyObject * self )
return PYSTR_FROMSTR( buf.getStr() );
}
-#if PY_MAJOR_VERSION >= 3
PyObject* PyUNO_getattr (PyObject* self, PyObject* attr_name)
-#else
-PyObject* PyUNO_getattr (PyObject* self, char* name)
-#endif
{
PyUNO* me;
-#if PY_VERSION_HEX >= 0x03030000 && PY_VERSION_HEX < 0x03060000
- char *name = PyUnicode_AsUTF8(attr_name);
-#elif PY_MAJOR_VERSION >= 3
- PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
- char *name = PyBytes_AsString(pUtf8.get());
-#endif
+ const char *name = PyUnicode_AsUTF8(attr_name);
try
{
Runtime runtime;
me = (PyUNO*) self;
-#if PY_MAJOR_VERSION < 3
- //Handle Python dir () stuff first...
- if (strcmp (name, "__members__") == 0)
- {
- PyObject* member_list;
- Sequence<OUString> oo_member_list;
-
- oo_member_list = me->members->xInvocation->getMemberNames ();
- member_list = PyList_New (oo_member_list.getLength ());
- for (int i = 0; i < oo_member_list.getLength (); i++)
- {
- // setitem steals a reference
- PyList_SetItem (member_list, i, ustring2PyString(oo_member_list[i]).getAcquired() );
- }
- return member_list;
- }
-#endif
if (strcmp (name, "__dict__") == 0)
{
Py_INCREF (Py_None);
return Py_None;
}
-#if PY_MAJOR_VERSION < 3
- if (strcmp (name, "__methods__") == 0)
- {
- Py_INCREF (Py_None);
- return Py_None;
- }
-#endif
if (strcmp (name, "__class__") == 0)
{
if( me->members->wrappedObject.getValueTypeClass() ==
@@ -560,20 +527,11 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
return NULL;
}
-#if PY_MAJOR_VERSION >= 3
int PyUNO_setattr (PyObject* self, PyObject* attr_name, PyObject* value)
-#else
-int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
-#endif
{
PyUNO* me;
-#if PY_VERSION_HEX >= 0x03030000 && PY_VERSION_HEX < 0x03060000
- char *name = PyUnicode_AsUTF8(attr_name);
-#elif PY_MAJOR_VERSION >= 3
- PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
- char *name = PyBytes_AsString(pUtf8.get());
-#endif
+ const char *name = PyUnicode_AsUTF8(attr_name);
me = (PyUNO*) self;
try
{
@@ -614,7 +572,6 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
return 1; //as above.
}
-#if PY_MAJOR_VERSION >= 3
static PyObject *PyUNO_dir( PyObject *self, PyObject *that )
{
PyUNO* me;
@@ -706,51 +663,6 @@ static struct PyMethodDef PyUNO_methods[] = {
{ NULL, NULL }
};
-#else
-// ensure object identity and struct equality
-static int PyUNO_cmp( PyObject *self, PyObject *that )
-{
- if( self == that )
- return 0;
- int retDefault = self > that ? 1 : -1;
- try
- {
- Runtime runtime;
- if( PyObject_IsInstance( that, getPyUnoClass().get() ) )
- {
-
- PyUNO *me = reinterpret_cast< PyUNO*> ( self );
- PyUNO *other = reinterpret_cast< PyUNO *> (that );
- com::sun::star::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass();
- com::sun::star::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass();
-
- if( tcMe == tcOther )
- {
- if( tcMe == com::sun::star::uno::TypeClass_STRUCT ||
- tcMe == com::sun::star::uno::TypeClass_EXCEPTION )
- {
- Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
- Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
- if( xMe->getMaterial() == xOther->getMaterial() )
- return 0;
- }
- else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
- {
- if( me->members->wrappedObject == other->members->wrappedObject )
-// if( me->members->xInvocation == other->members->xInvocation )
- return 0;
- }
- }
- }
- }
- catch( com::sun::star::uno::RuntimeException & e)
- {
- raisePyExceptionWithAny( makeAny( e ) );
- }
- return retDefault;
-}
-#endif
-
static PyTypeObject PyUNOType =
{
PyVarObject_HEAD_INIT(&PyType_Type, 0)
@@ -759,15 +671,9 @@ static PyTypeObject PyUNOType =
0,
(destructor) PyUNO_del,
(printfunc) 0,
-#if PY_MAJOR_VERSION >= 3
(getattrfunc) 0,
(setattrfunc) 0,
0,
-#else
- (getattrfunc) PyUNO_getattr, /* tp_getattr */
- (setattrfunc) PyUNO_setattr, /* tp_setattr */
- (cmpfunc) PyUNO_cmp,
-#endif
(reprfunc) PyUNO_repr,
0,
0,
@@ -775,31 +681,18 @@ static PyTypeObject PyUNOType =
(hashfunc) 0,
(ternaryfunc) 0,
(reprfunc) PyUNO_str,
-#if PY_MAJOR_VERSION >= 3
(getattrofunc)PyUNO_getattr, /* tp_getattro */
(setattrofunc)PyUNO_setattr, /* tp_setattro */
-#else
- (getattrofunc)0,
- (setattrofunc)0,
-#endif
NULL,
0,
NULL,
(traverseproc)0,
(inquiry)0,
-#if PY_MAJOR_VERSION >= 3
PyUNO_richcompare, /* tp_richcompare */
-#else
- (richcmpfunc)0,
-#endif
0,
(getiterfunc)0,
(iternextfunc)0,
-#if PY_MAJOR_VERSION >= 3
PyUNO_methods, /* tp_methods */
-#else
- NULL,
-#endif
NULL,
NULL,
NULL,
@@ -817,10 +710,8 @@ static PyTypeObject PyUNOType =
NULL,
NULL,
NULL,
- (destructor)0
-#if PY_VERSION_HEX >= 0x02060000 && PY_VERSION_HEX < 0x03060000
- , 0
-#endif
+ (destructor)0,
+ 0
};
PyRef getPyUnoClass()
diff --git a/main/pyuno/source/module/pyuno_callable.cxx b/main/pyuno/source/module/pyuno_callable.cxx
index 4b464cf197..a43da97c5c 100644
--- a/main/pyuno/source/module/pyuno_callable.cxx
+++ b/main/pyuno/source/module/pyuno_callable.cxx
@@ -197,11 +197,7 @@ static PyTypeObject PyUNO_callable_Type =
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
-#if PY_MAJOR_VERSION >= 3
0,
-#else
- (cmpfunc) 0,
-#endif
(reprfunc) 0,
0,
0,
@@ -238,10 +234,8 @@ static PyTypeObject PyUNO_callable_Type =
NULL,
NULL,
NULL,
- (destructor)0
-#if PY_VERSION_HEX >= 0x02060000
- , 0
-#endif
+ (destructor)0,
+ 0
};
PyRef PyUNO_callable_new (
diff --git a/main/pyuno/source/module/pyuno_dlopenwrapper.c b/main/pyuno/source/module/pyuno_dlopenwrapper.c
index 00ec03424d..7ab1eee86c 100644
--- a/main/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/main/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -49,24 +49,12 @@
#endif
#include <dlfcn.h>
-#if PY_MAJOR_VERSION >= 3
SAL_DLLPUBLIC_EXPORT void* PyInit_pyuno(void)
-#else
-SAL_DLLPUBLIC_EXPORT void initpyuno ()
-#endif
{
Dl_info dl_info;
-#if PY_MAJOR_VERSION >= 3
void* (*func)(void);
-#else
- void (*func)(void);
-#endif
-#if PY_MAJOR_VERSION >= 3
if (dladdr((void*)&PyInit_pyuno, &dl_info) != 0) {
-#else
- if (dladdr((void*)&initpyuno, &dl_info) != 0) {
-#endif
void* h = 0;
size_t len = strrchr(dl_info.dli_fname, '/') - dl_info.dli_fname + 1;
char* libname = malloc(len + RTL_CONSTASCII_LENGTH( SAL_DLLPREFIX "pyuno" SAL_DLLEXTENSION ) + 1);
@@ -77,15 +65,9 @@ SAL_DLLPUBLIC_EXPORT void initpyuno ()
free(libname);
if( h )
{
-#if PY_MAJOR_VERSION >= 3
func = (void* (*)(void))dlsym (h, "PyInit_pyuno");
-#else
- func = (void (*)(void))dlsym (h, "initpyuno");
-#endif
return (func) ();
}
}
-#if PY_MAJOR_VERSION >= 3
return NULL;
-#endif
}
diff --git a/main/pyuno/source/module/pyuno_except.cxx b/main/pyuno/source/module/pyuno_except.cxx
index 2fdff7944c..1605e1f1c5 100644
--- a/main/pyuno/source/module/pyuno_except.cxx
+++ b/main/pyuno/source/module/pyuno_except.cxx
@@ -179,9 +179,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
PyRef getter = getObjectFromUnoModule( runtime,"_uno_struct__getattr__" );
PyRef repr = getObjectFromUnoModule( runtime,"_uno_struct__repr__" );
PyRef eq = getObjectFromUnoModule( runtime,"_uno_struct__eq__" );
-#if PY_MAJOR_VERSION >= 3
PyRef dir = getObjectFromUnoModule( runtime, "_uno_struct__dir__" );
-#endif
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__pyunostruct__"),
@@ -201,10 +199,8 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
ret.get(), const_cast< char * >("__str__"), repr.get() );
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__eq__"), eq.get() );
-#if PY_MAJOR_VERSION >= 3
PyObject_SetAttrString(
ret.get(), const_cast< char * >("__dir__"), dir.get() );
-#endif
}
return ret;
}
diff --git a/main/pyuno/source/module/pyuno_impl.hxx b/main/pyuno/source/module/pyuno_impl.hxx
index 6178232811..39404b2849 100644
--- a/main/pyuno/source/module/pyuno_impl.hxx
+++ b/main/pyuno/source/module/pyuno_impl.hxx
@@ -46,15 +46,9 @@
//
// Local workarounds for compatibility issues
//
-#if PY_MAJOR_VERSION >= 3
#define PYSTR_FROMSTR PyUnicode_FromString
#define USTR_TO_PYSTR ustring2PyUnicode
#define PYSTR_CHECK PyUnicode_Check
-#else
- #define PYSTR_FROMSTR PyBytes_FromString
- #define USTR_TO_PYSTR ustring2PyString
- #define PYSTR_CHECK PyBytes_Check
-#endif
#include <rtl/string.hxx>
inline void PyErr_SetString( PyObject* pyObj, const rtl::OString& rName) { PyErr_SetString( pyObj, rName.getStr());}
@@ -140,7 +134,6 @@ typedef struct
} PyUNO;
PyRef ustring2PyUnicode( const rtl::OUString &source );
-PyRef ustring2PyString( const ::rtl::OUString & source );
rtl::OUString pyString2ustring( PyObject *str );
diff --git a/main/pyuno/source/module/pyuno_module.cxx b/main/pyuno/source/module/pyuno_module.cxx
index e201e023a0..61f7a79d35 100644
--- a/main/pyuno/source/module/pyuno_module.cxx
+++ b/main/pyuno/source/module/pyuno_module.cxx
@@ -225,11 +225,7 @@ PyObject * extractOneStringArg( PyObject *args, char const *funcName )
return NULL;
}
PyObject *obj = PyTuple_GetItem( args, 0 );
-#if PY_MAJOR_VERSION >= 3
if( ! PyUnicode_Check(obj) )
-#else
- if( !PyBytes_Check( obj ) && ! PyUnicode_Check(obj))
-#endif
{
OStringBuffer buf;
buf.append( funcName ).append( ": expecting one string argument" );
@@ -488,18 +484,9 @@ static PyObject *isInterface( PyObject *, PyObject *args )
{
PyObject *obj = PyTuple_GetItem( args, 0 );
Runtime r;
-#if PY_MAJOR_VERSION >= 3
return PyLong_FromLong( isInterfaceClass( r, obj ) );
-#else
- return PyInt_FromLong( isInterfaceClass( r, obj ) );
-
-#endif
}
-#if PY_MAJOR_VERSION >= 3
return PyLong_FromLong( 0 );
-#else
- return PyInt_FromLong( 0 );
-#endif
}
static PyObject * generateUuid( PyObject *, PyObject * )
@@ -607,14 +594,7 @@ static PyObject * invoke ( PyObject *, PyObject * args )
if( PYSTR_CHECK( PyTuple_GetItem( args, 1 ) ) )
{
-#if PY_VERSION_HEX >= 0x03030000
const char *name = PyUnicode_AsUTF8( PyTuple_GetItem( args, 1 ) );
-#elif PY_MAJOR_VERSION >= 3
- PyRef pUtf8(PyUnicode_AsUTF8String( PyTuple_GetItem( args, 1 ) ), SAL_NO_ACQUIRE);
- const char *name = PyBytes_AsString( pUtf8.get() );
-#else
- const char *name = PyBytes_AsString( PyTuple_GetItem( args, 1 ) );
-#endif
if( PyTuple_Check( PyTuple_GetItem( args , 2 )))
{
ret = PyUNO_invoke( object, name , PyTuple_GetItem( args, 2 ) );
@@ -623,11 +603,7 @@ static PyObject * invoke ( PyObject *, PyObject * args )
{
OStringBuffer buf;
buf.append( "uno.invoke expects a tuple as 3rd argument, got " );
-#if PY_MAJOR_VERSION >= 3
buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 2 ) ), RTL_TEXTENCODING_ASCII_US) );
-#else
- buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 2) ) ) );
-#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -635,11 +611,7 @@ static PyObject * invoke ( PyObject *, PyObject * args )
{
OStringBuffer buf;
buf.append( "uno.invoke expected a string as 2nd argument, got " );
-#if PY_MAJOR_VERSION >= 3
buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 1 ) ), RTL_TEXTENCODING_ASCII_US ) );
-#else
- buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 1) ) ) );
-#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -689,11 +661,7 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
{
OStringBuffer buf;
buf.append( "uno.setCurrentContext expects an XComponentContext implementation, got " );
-#if PY_MAJOR_VERSION >= 3
buf.append( OUStringToOString( pyString2ustring( PyTuple_GetItem( args, 0 ) ), RTL_TEXTENCODING_ASCII_US ) );
-#else
- buf.append( PyBytes_AsString( PyObject_Str( PyTuple_GetItem( args, 0) ) ) );
-#endif
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
}
}
@@ -733,7 +701,6 @@ struct PyMethodDef PyUNOModule_methods [] =
{NULL, NULL, 0, NULL}
};
-#if PY_MAJOR_VERSION >= 3
static struct PyModuleDef PyUNOModule =
{
PyModuleDef_HEAD_INIT,
@@ -742,16 +709,12 @@ static struct PyModuleDef PyUNOModule =
-1,
PyUNOModule_methods
};
-#endif
}
-#if PY_MAJOR_VERSION >= 3
PY_DLLEXPORT PyMODINIT_FUNC PyInit_pyuno()
{
PyObject *m;
- PyEval_InitThreads();
-
m = PyModule_Create(&PyUNOModule);
if (m == NULL)
return NULL;
@@ -760,12 +723,3 @@ PY_DLLEXPORT PyMODINIT_FUNC PyInit_pyuno()
return NULL;
return m;
}
-#else
-extern "C" PY_DLLEXPORT void initpyuno()
-{
- // noop when called already, otherwise needed to allow multiple threads
- // This has to be reworked for Python 3.
- PyEval_InitThreads();
- Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
-}
-#endif
diff --git a/main/pyuno/source/module/pyuno_runtime.cxx b/main/pyuno/source/module/pyuno_runtime.cxx
index 7f196f4da9..8d502340cb 100644
--- a/main/pyuno/source/module/pyuno_runtime.cxx
+++ b/main/pyuno/source/module/pyuno_runtime.cxx
@@ -75,11 +75,7 @@ static PyTypeObject RuntimeImpl_Type =
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
-#if PY_MAJOR_VERSION >= 3
0,
-#else
- (cmpfunc) 0,
-#endif
(reprfunc) 0,
0,
0,
@@ -116,10 +112,8 @@ static PyTypeObject RuntimeImpl_Type =
NULL,
NULL,
NULL,
- (destructor)0
-#if PY_VERSION_HEX >= 0x02060000
- , 0
-#endif
+ (destructor)0,
+ 0
};
/*----------------------------------------------------------------------
@@ -444,11 +438,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
{
sal_Int32 l = 0;
a >>= l;
-#if PY_MAJOR_VERSION >= 3
return PyRef( PyLong_FromLong (l), SAL_NO_ACQUIRE );
-#else
- return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE );
-#endif
}
case typelib_TypeClass_UNSIGNED_LONG:
{
@@ -669,7 +659,6 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
{
}
-#if PY_MAJOR_VERSION >= 3 // Python 3 has no PyInt
else if (PyBool_Check(o))
{
if( o == Py_True )
@@ -683,39 +672,6 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
a = Any( &b, getBooleanCppuType() );
}
}
-#else
- else if (PyInt_Check (o))
- {
- if( o == Py_True )
- {
- sal_Bool b = sal_True;
- a = Any( &b, getBooleanCppuType() );
- }
- else if ( o == Py_False )
- {
- sal_Bool b = sal_False;
- a = Any( &b, getBooleanCppuType() );
- }
- else
- {
- sal_Int32 l = (sal_Int32) PyInt_AsLong( o );
- if( l < 128 && l >= -128 )
- {
- sal_Int8 b = (sal_Int8 ) l;
- a <<= b;
- }
- else if( l <= 0x7fff && l >= -0x8000 )
- {
- sal_Int16 s = (sal_Int16) l;
- a <<= s;
- }
- else
- {
- a <<= l;
- }
- }
- }
-#endif // Python 3 has no PyInt
else if (PyLong_Check (o))
{
sal_Int64 l = (sal_Int64)PyLong_AsLong (o);
@@ -745,10 +701,6 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
double d = PyFloat_AsDouble (o);
a <<= d;
}
-#if PY_MAJOR_VERSION < 3
- else if (PyBytes_Check (o))
- a <<= pyString2ustring(o);
-#endif
else if( PyUnicode_Check( o ) )
a <<= pyString2ustring(o);
else if (PyTuple_Check (o))
@@ -773,13 +725,11 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
seq = Sequence<sal_Int8 > (
(sal_Int8*) PyBytes_AsString(str.get()), PyBytes_Size(str.get()));
}
-#if PY_MAJOR_VERSION >= 3
else if ( PyByteArray_Check( str.get() ) )
{
seq = Sequence< sal_Int8 >(
(sal_Int8 *) PyByteArray_AS_STRING(str.get()), PyByteArray_GET_SIZE(str.get()));
}
-#endif
a <<= seq;
}
else
diff --git a/main/pyuno/source/module/pyuno_type.cxx b/main/pyuno/source/module/pyuno_type.cxx
index 4f866d2e4f..4bc989ee48 100644
--- a/main/pyuno/source/module/pyuno_type.cxx
+++ b/main/pyuno/source/module/pyuno_type.cxx
@@ -150,21 +150,13 @@ sal_Unicode PyChar2Unicode( PyObject *obj ) throw ( RuntimeException )
Reference< XInterface > () );
}
-#if PY_VERSION_HEX >= 0x030C0000
if( PyUnicode_GetLength( value.get() ) < 1 )
-#else
- if( PyUnicode_GetSize( value.get() ) < 1 )
-#endif
{
throw RuntimeException(
USTR_ASCII( "uno.Char contains an empty unicode string" ),
Reference< XInterface > () );
}
-#if PY_VERSION_HEX >= 0x03030000
sal_Unicode c = (sal_Unicode)PyUnicode_ReadChar( value.get(), 0 );
-#else
- sal_Unicode c = (sal_Unicode)PyUnicode_AsUnicode( value.get() )[0];
-#endif
return c;
}
@@ -283,18 +275,8 @@ PyObject *importToGlobal(PyObject *str, PyObject *dict, PyObject *target)
Py_INCREF( typesModule.get() );
PyDict_SetItemString( dict, "unotypes" , typesModule.get() );
}
-#if PY_VERSION_HEX >= 0x03030000
const char *targetName = PyUnicode_AsUTF8( target );
const char *typeName = PyUnicode_AsUTF8( str );
-#elif PY_MAJOR_VERSION > 3
- PyRef pUtf8( PyUnicode_AsUTF8String( target ), SAL_NO_ACQUIRE );
- const char *targetName = PyBytes_AsString( pUtf8.get() );
- PyRef pTypeName( PyUnicode_AsUTF8String( str ), SAL_NO_ACQUIRE );
- const char *typeName = PyBytes_AsString( pTypeName.get() );
-#else
- /*const*/ char *targetName = PyBytes_AsString( target );
- const char *typeName = PyBytes_AsString( str );
-#endif
PyModule_AddObject(
typesModule.get(),
targetName,
@@ -315,14 +297,7 @@ PyObject *importToGlobal(PyObject *str, PyObject *dict, PyObject *target)
{
OString enumElementName(
OUStringToOString( pDesc->ppEnumNames[i], RTL_TEXTENCODING_ASCII_US) );
-#if PY_VERSION_HEX >= 0x03030000
const char *name = PyUnicode_AsUTF8(str);
-#elif PY_MAJOR_VERSION > 3
- PyRef *pUtf8( PyUnicode_AsUTF8String( str ), SAL_NO_ACQUIRE );
- const char *name = PyBytes_AsString( pUtf8.get() );
-#else
- const char *name = PyBytes_AsString(str);
-#endif
PyDict_SetItemString(
dict, (char*)enumElementName.getStr(),
PyUNO_Enum_new(name, enumElementName.getStr(), runtime ) );
@@ -434,16 +409,9 @@ PyObject* PyUNO_char_new ( sal_Unicode val , const Runtime &r )
// retrieve type object
PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE );
-#if PY_VERSION_HEX >= 0x03030000
Py_UCS2 u[1];
u[0] = val;
PyTuple_SetItem( args.get(), 0, PyUnicode_FromKindAndData( PyUnicode_2BYTE_KIND, u, 1 ) );
-#else
- Py_UNICODE u[2];
- u[0] = val;
- u[1] = 0;
- PyTuple_SetItem( args.get() , 0 , PyUnicode_FromUnicode( u ,1) );
-#endif
return callCtor( r, "Char" , args );
}
diff --git a/main/pyuno/source/module/pyuno_util.cxx b/main/pyuno/source/module/pyuno_util.cxx
index c7fd5b0470..a876db5df2 100644
--- a/main/pyuno/source/module/pyuno_util.cxx
+++ b/main/pyuno/source/module/pyuno_util.cxx
@@ -62,40 +62,19 @@ PyRef ustring2PyUnicode( const OUString & str )
{
PyRef ret;
-#if Py_UNICODE_SIZE == 2
- // YD force conversion since python/2 uses wchar_t
- ret = PyRef( PyUnicode_FromUnicode( (const Py_UNICODE*)str.getStr(), str.getLength() ), SAL_NO_ACQUIRE );
-#else
OString sUtf8(OUStringToOString(str, RTL_TEXTENCODING_UTF8));
ret = PyRef( PyUnicode_DecodeUTF8( sUtf8.getStr(), sUtf8.getLength(), NULL) , SAL_NO_ACQUIRE );
-#endif
return ret;
}
-PyRef ustring2PyString( const OUString &str )
-{
- OString o = OUStringToOString( str, osl_getThreadTextEncoding() );
- return PyRef( PyBytes_FromString( o.getStr() ), SAL_NO_ACQUIRE );
-}
-
OUString pyString2ustring( PyObject *pystr )
{
OUString ret;
if( PyUnicode_Check( pystr ) )
{
-#if Py_UNICODE_SIZE == 2
- ret = OUString( (sal_Unicode * ) PyUnicode_AS_UNICODE( pystr ) );
-#else
-#if PY_VERSION_HEX >= 0x03030000 && PY_VERSION_HEX < 0x03060000
- Py_ssize_t size;
- char *pUtf8 = PyUnicode_AsUTF8AndSize(pystr, &size);
- ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
-#else
- PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
- ret = OUString(PyBytes_AsString(pUtf8), PyBytes_Size(pUtf8), RTL_TEXTENCODING_UTF8);
- Py_DECREF(pUtf8);
-#endif
-#endif
+ Py_ssize_t size;
+ const char *pUtf8 = PyUnicode_AsUTF8AndSize(pystr, &size);
+ ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
}
else
{
diff --git a/main/scripting/source/pyprov/pythonscript.py b/main/scripting/source/pyprov/pythonscript.py
index 03f52b897a..1a3f288281 100644
--- a/main/scripting/source/pyprov/pythonscript.py
+++ b/main/scripting/source/pyprov/pythonscript.py
@@ -27,6 +27,7 @@ import os
import types
import time
import ast
+import re
try:
unicode
@@ -296,6 +297,36 @@ def ensureSourceState( code ):
return code
+# Heuristics for Python 2 constructs that are *syntax* errors under Python 3.
+# These fail at compile() time, so a runtime shim cannot fix them; the best we
+# can do is recognise the most common ones and tell the user the script needs
+# to be ported, instead of surfacing a bare SyntaxError traceback.
+PYTHON2_SYNTAX_HINTS = (
+ (re.compile( r"^\s*print\s+[^(=]" ), "'print' statement (use the print() function)"),
+ (re.compile( r"^\s*exec\s+[^(=]" ), "'exec' statement (use the exec() function)"),
+ (re.compile( r"\bexcept\b[^:]*,\s*\w+\s*:" ), "'except Exception, e:' syntax (use 'except Exception as e:')"),
+ (re.compile( r"\braise\s+\w+\s*," ), "'raise Exc, args' syntax (use 'raise Exc(args)')"),
+ (re.compile( r"`[^`]+`" ), "backtick repr `x` (use repr(x))"),
+ (re.compile( r"<>" ), "'<>' operator (use '!=')"),
+ (re.compile( r"\b0[0-7]+\b" ), "old-style octal literal (use the 0o prefix)"),
+ (re.compile( r"\b[uU][rR]['\"]" ), "'ur' string prefix (removed in Python 3)"),
+)
+
+def detectPython2Syntax( src, syntaxError ):
+ # Prefer the exact line the compiler flagged; fall back to scanning the source.
+ candidates = []
+ text = getattr( syntaxError, "text", None )
+ if text:
+ candidates.append( text )
+ else:
+ candidates = src.split( "\n" )
+ for line in candidates:
+ for pattern, description in PYTHON2_SYNTAX_HINTS:
+ if pattern.search( line ):
+ return description
+ return None
+
+
def checkForPythonPathBesideScript( url ):
if url.startswith( "file:" ):
path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
@@ -493,10 +524,17 @@ class ProviderContext:
entry.module.__dict__[GLOBAL_SCRIPTCONTEXT_NAME] = self.scriptContext
code = None
- if url.startswith( "file:" ):
- code = compile( src, encfile(uno.fileUrlToSystemPath( url ) ), "exec" )
- else:
- code = compile( src, url, "exec" )
+ scriptName = uno.fileUrlToSystemPath( url ) if url.startswith( "file:" ) else url
+ try:
+ code = compile( src, encfile(scriptName) if url.startswith( "file:" ) else url, "exec" )
+ except SyntaxError as e:
+ hint = detectPython2Syntax( src, e )
+ if hint:
+ raise SyntaxError(
+ "The script '" + scriptName + "' appears to use Python 2 syntax that is "
+ "not valid in Python 3: " + hint + ". Please port the script to Python 3. "
+ "(original error: " + str(e) + ")" )
+ raise
exec(code, entry.module.__dict__)
entry.module.__file__ = url
self.modules[ url ] = entry