Closes #27407: Merge with 3.5

9 files changed, 21 insertions, 19 deletions

diff --git a/PCbuild/build_pgo.bat b/PCbuild/build_pgo.bat
deleted file mode 100644
index 872c3822ec..0000000000
--- a/PCbuild/build_pgo.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off

-echo.DeprecationWarning:

-echo.    This script is deprecated, use `build.bat --pgo` instead.

-echo.

-

-call "%~dp0build.bat" --pgo %*

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 9b2a084bc2..ff50af5d53 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -56,8 +56,8 @@ set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06

 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h

 set libraries=%libraries%                                    sqlite-3.8.11.0

-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2

-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2

+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0

+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0

 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6

 set libraries=%libraries%                                    xz-5.0.5

 

diff --git a/PCbuild/prepare_ssl.bat b/PCbuild/prepare_ssl.bat
index 1be73e6c36..2f41ae847d 100644
--- a/PCbuild/prepare_ssl.bat
+++ b/PCbuild/prepare_ssl.bat
@@ -3,10 +3,10 @@ if not defined HOST_PYTHON (
   if "%1" EQU "Debug" (

     shift

     set HOST_PYTHON=python_d.exe

-    if not exist python35_d.dll exit 1

+    if not exist python36_d.dll exit 1

   ) ELSE (

     set HOST_PYTHON=python.exe

-    if not exist python35.dll exit 1

+    if not exist python36.dll exit 1

   )

 )

 %HOST_PYTHON% "%~dp0prepare_ssl.py" %1

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 3a1b5ba8be..9dfe9e3f5d 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -124,6 +124,7 @@
     <ClInclude Include="..\Include\odictobject.h" />
     <ClInclude Include="..\Include\opcode.h" />
     <ClInclude Include="..\Include\osdefs.h" />
+    <ClInclude Include="..\Include\osmodule.h" />
     <ClInclude Include="..\Include\parsetok.h" />
     <ClInclude Include="..\Include\patchlevel.h" />
     <ClInclude Include="..\Include\pgen.h" />
@@ -209,6 +210,7 @@
     <ClInclude Include="..\Python\condvar.h" />
     <ClInclude Include="..\Python\importdl.h" />
     <ClInclude Include="..\Python\thread_nt.h" />
+    <ClInclude Include="..\Python\wordcode_helpers.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_bisectmodule.c" />
@@ -416,4 +418,4 @@
   <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140'">
     <Warning Text="Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 837b73690a..ce2ea60a58 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -177,6 +177,9 @@
     <ClInclude Include="..\Include\osdefs.h">
       <Filter>Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\osmodule.h">
+      <Filter>Include</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\parsetok.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -420,6 +423,9 @@
     <ClInclude Include="..\Python\thread_nt.h">
       <Filter>Python</Filter>
     </ClInclude>
+    <ClInclude Include="..\Python\wordcode_helpers.h">
+      <Filter>Python</Filter>
+    </ClInclude>
     <ClInclude Include="..\Python\condvar.h">
       <Filter>Python</Filter>
     </ClInclude>
@@ -980,4 +986,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index d45eb271f8..7f488ae676 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -48,7 +48,7 @@ Debug
     Used to build Python with extra debugging capabilities, equivalent

     to using ./configure --with-pydebug on UNIX.  All binaries built

     using this configuration have "_d" added to their name:

-    python35_d.dll, python_d.exe, parser_d.pyd, and so on.  Both the

+    python36_d.dll, python_d.exe, parser_d.pyd, and so on.  Both the

     build and rt (run test) batch files in this directory accept a -d

     option for debug builds.  If you are building Python to help with

     development of CPython, you will most likely use this configuration.

@@ -208,7 +208,7 @@ _sqlite3
     Homepage:

         http://www.sqlite.org/

 _tkinter

-    Wraps version 8.6.4 of the Tk windowing system.

+    Wraps version 8.6.6 of the Tk windowing system.

     Homepage:

         http://www.tcl.tk/

 

diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 2d93b80a49..7d4d0719ce 100644
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -42,7 +42,7 @@ if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts
 if NOT "%1"=="" (set regrtestargs=%regrtestargs% %1) & shift & goto CheckOpts

 

 set exe=%prefix%python%suffix%.exe

-set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %regrtestargs%

+set cmd="%exe%" %dashO% -Wd -E -bb -m test %regrtestargs%

 if defined qmode goto Qmode

 

 echo Deleting .pyc/.pyo files ...

diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 11dbffbdbf..57bb98aeeb 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -4,8 +4,8 @@
   <PropertyGroup>
     <TclMajorVersion>8</TclMajorVersion>
     <TclMinorVersion>6</TclMinorVersion>
-    <TclPatchLevel>4</TclPatchLevel>
-    <TclRevision>2</TclRevision>
+    <TclPatchLevel>6</TclPatchLevel>
+    <TclRevision>0</TclRevision>
     <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
     <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
     <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
@@ -42,4 +42,4 @@
     <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>
     <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj
index 0144fa9a3d..9dbdc77335 100644
--- a/PCbuild/xxlimited.vcxproj
+++ b/PCbuild/xxlimited.vcxproj
@@ -62,7 +62,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);Py_LIMITED_API=0x03050000</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);Py_LIMITED_API=0x03060000</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>