Merge 3.6 (fix #29519)

3 files changed, 4 insertions, 4 deletions

diff --git a/PCbuild/prepare_ssl.bat b/PCbuild/prepare_ssl.bat
index 2f41ae847d..33f878e616 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 python36_d.dll exit 1

+    if not exist python37_d.dll exit 1

   ) ELSE (

     set HOST_PYTHON=python.exe

-    if not exist python36.dll exit 1

+    if not exist python37.dll exit 1

   )

 )

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

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index c04ba4e46b..00b50be017 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:

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

+    python37_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.

diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 35826727f3..b418a8b7c2 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 -m test %regrtestargs%

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

 if defined qmode goto Qmode

 

 echo Deleting .pyc/.pyo files ...