[Python-3000-checkins] r58414 - in python/branches/py3k: PC/config.c PCbuild/python.iss PCbuild/python20.wse PCbuild/pythoncore.vcproj

[fred.drake]

Author: fred.drake
Date: Thu Oct 11 20:05:38 2007
New Revision: 58414

Modified:
   python/branches/py3k/PC/config.c
   python/branches/py3k/PCbuild/python.iss
   python/branches/py3k/PCbuild/python20.wse
   python/branches/py3k/PCbuild/pythoncore.vcproj
Log:
clean out some hotshot-related build turds

Modified: python/branches/py3k/PC/config.c
==============================================================================
--- python/branches/py3k/PC/config.c	(original)
+++ python/branches/py3k/PC/config.c	Thu Oct 11 20:05:38 2007
@@ -28,7 +28,6 @@
 #endif
 extern void init_codecs(void);
 extern void init_weakref(void);
-extern void init_hotshot(void);
 extern void initxxsubtype(void);
 extern void initzipimport(void);
 extern void init_random(void);

Modified: python/branches/py3k/PCbuild/python.iss
==============================================================================
--- python/branches/py3k/PCbuild/python.iss	(original)
+++ python/branches/py3k/PCbuild/python.iss	Thu Oct 11 20:05:38 2007
@@ -174,10 +174,8 @@
 Source: Lib\distutils\*.*; DestDir: {app}\Lib\distutils; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\email\*.*; DestDir: {app}\Lib\email; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\encodings\*.*; DestDir: {app}\Lib\encodings; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
-Source: Lib\hotshot\*.*; DestDir: {app}\Lib\hotshot; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\lib-old\*.*; DestDir: {app}\Lib\lib-old; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\xml\*.*; DestDir: {app}\Lib\xml; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
-Source: Lib\hotshot\*.*; DestDir: {app}\Lib\hotshot; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs
 Source: Lib\test\*.*; DestDir: {app}\Lib\test; CopyMode: alwaysoverwrite; Components: test; Flags: recursesubdirs
 
 Source: Lib\site-packages\README.txt; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: main
@@ -284,9 +282,6 @@
 Name: {app}\Lib\encodings\*.pyc; Type: files
 Name: {app}\Lib\encodings\*.pyo; Type: files
 Name: {app}\Lib\encodings; Type: dirifempty
-Name: {app}\Lib\hotshot\*.pyc; Type: files
-Name: {app}\Lib\hotshot\*.pyo; Type: files
-Name: {app}\Lib\hotshot; Type: dirifempty
 Name: {app}\Lib\lib-old\*.pyc; Type: files
 Name: {app}\Lib\lib-old\*.pyo; Type: files
 Name: {app}\Lib\lib-old; Type: dirifempty

Modified: python/branches/py3k/PCbuild/python20.wse
==============================================================================
--- python/branches/py3k/PCbuild/python20.wse	(original)
+++ python/branches/py3k/PCbuild/python20.wse	Thu Oct 11 20:05:38 2007
@@ -2024,14 +2024,6 @@
 item: Remark
 end
 item: Install File
-  Source=..\lib\hotshot\*.py
-  Destination=%MAINDIR%\Lib\hotshot
-  Description=Fast Python profiler
-  Flags=0000000000000010
-end
-item: Remark
-end
-item: Install File
   Source=..\lib\lib-old\*.py
   Destination=%MAINDIR%\Lib\lib-old
   Description=Obsolete modules

Modified: python/branches/py3k/PCbuild/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/pythoncore.vcproj	(original)
+++ python/branches/py3k/PCbuild/pythoncore.vcproj	Thu Oct 11 20:05:38 2007
@@ -380,9 +380,6 @@
 			RelativePath="..\Modules\_heapqmodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\_hotshot.c">
-		</File>
-		<File
 			RelativePath="..\Modules\_localemodule.c">
 		</File>
 		<File