Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists.

This introduces a small private API for this common pattern.
The issue has been discovered thanks to Martin's huge-mem buildbot.

8 files changed, 19 insertions, 23 deletions

diff --git a/PCbuild/bz2.vcproj b/PCbuild/_bz2.vcproj
index 035736e286..e6b9c886d1 100644
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/_bz2.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="9,00"

-	Name="bz2"

+	Name="_bz2"

 	ProjectGUID="{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"

 	RootNamespace="bz2"

 	Keyword="Win32Proj"

@@ -527,7 +527,7 @@
 			Name="Source Files"

 			>

 			<File

-				RelativePath="..\Modules\bz2module.c"

+				RelativePath="..\Modules\_bz2module.c"

 				>

 			</File>

 		</Filter>

diff --git a/PCbuild/_multiprocessing.vcproj b/PCbuild/_multiprocessing.vcproj
index 5d6337d469..e9cd3a8101 100644
--- a/PCbuild/_multiprocessing.vcproj
+++ b/PCbuild/_multiprocessing.vcproj
@@ -522,10 +522,6 @@
 				RelativePath="..\Modules\_multiprocessing\multiprocessing.h"

 				>

 			</File>

-			<File

-				RelativePath="..\Modules\_multiprocessing\connection.h"

-				>

-			</File>

 		</Filter>

 		<Filter

 			Name="Source Files"

@@ -535,18 +531,10 @@
 				>

 			</File>

 			<File

-				RelativePath="..\Modules\_multiprocessing\pipe_connection.c"

-				>

-			</File>

-			<File

 				RelativePath="..\Modules\_multiprocessing\semaphore.c"

 				>

 			</File>

 			<File

-				RelativePath="..\Modules\_multiprocessing\socket_connection.c"

-				>

-			</File>

-			<File

 				RelativePath="..\Modules\_multiprocessing\win32_functions.c"

 				>

 			</File>

diff --git a/PCbuild/build_ssl.bat b/PCbuild/build_ssl.bat
index cee64a8a59..357b08b66c 100644
--- a/PCbuild/build_ssl.bat
+++ b/PCbuild/build_ssl.bat
@@ -2,10 +2,10 @@
 if not defined HOST_PYTHON (
   if %1 EQU Debug (
     set HOST_PYTHON=python_d.exe
-    if not exist python31_d.dll exit 1
+    if not exist python33_d.dll exit 1
   ) ELSE (
     set HOST_PYTHON=python.exe
-    if not exist python31.dll exit 1
+    if not exist python33.dll exit 1
   )
 )
 %HOST_PYTHON% build_ssl.py %1 %2 %3
diff --git a/PCbuild/kill_python.c b/PCbuild/kill_python.c
index 6b916781cc..bb323d31d0 100644
--- a/PCbuild/kill_python.c
+++ b/PCbuild/kill_python.c
@@ -106,7 +106,7 @@ main(int argc, char **argv)
         /*
          * XXX TODO: if we really wanted to be fancy, we could check the 
          * modules for all processes (not just the python[_d].exe ones)
-         * and see if any of our DLLs are loaded (i.e. python32[_d].dll),
+         * and see if any of our DLLs are loaded (i.e. python33[_d].dll),
          * as that would also inhibit our ability to rebuild the solution.
          * Not worth loosing sleep over though; for now, a simple check 
          * for just the python executable should be sufficient.
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 1de4ea1e27..ed3a7a0bcd 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -87,7 +87,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj
 		{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}"

+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

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 3f69a426f7..4eab942821 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -38,7 +38,7 @@
 	/>

 	<UserMacro

 		Name="PyDllName"

-		Value="python32"

+		Value="python33"

 	/>

 	<UserMacro

 		Name="PythonExe"

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index f83f6b1895..69a8ca8c7c 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -891,6 +891,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\Include\pymacro.h"

+				>

+			</File>

+			<File

 				RelativePath="..\Include\pymem.h"

 				>

 			</File>

@@ -1091,6 +1095,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\Modules\faulthandler.c"

+				>

+			</File>

+			<File

 				RelativePath="..\Modules\gcmodule.c"

 				>

 			</File>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index dbe031f474..11ab1276cd 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -37,7 +37,7 @@ NOTE:
    running a Python core buildbot test slave; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name:  python32_d.dll, python_d.exe, parser_d.pyd, and so on. Both
+their name:  python33_d.dll, python_d.exe, parser_d.pyd, and so on. Both
 the build and rt batch files accept a -d option for debug builds.
 
 The 32bit builds end up in the solution folder PCbuild while the x64 builds
@@ -112,9 +112,9 @@ _tkinter
     pre-built Tcl/Tk in either ..\..\tcltk for 32-bit or ..\..\tcltk64 for
     64-bit (relative to this directory).  See below for instructions to build
     Tcl/Tk. 
-bz2
-    Python wrapper for the libbz2 compression library.  Homepage
-        http://sources.redhat.com/bzip2/
+_bz2
+    Python wrapper for the libbzip2 compression library.  Homepage
+        http://www.bzip.org/
     Download the source from the python.org copy into the dist
     directory: