[Python-3000-checkins] r58446 - in python/branches/py3k: PC/VC6/pythoncore.dsp PC/config.c PC/os2emx/Makefile PC/os2emx/config.c PCbuild8/pythoncore/pythoncore.vcproj Tools/scripts/README

neal.norwitz python-3000-checkins at python.org
Sat Oct 13 20:56:01 CEST 2007


Author: neal.norwitz
Date: Sat Oct 13 20:56:00 2007
New Revision: 58446

Modified:
   python/branches/py3k/PC/VC6/pythoncore.dsp
   python/branches/py3k/PC/config.c
   python/branches/py3k/PC/os2emx/Makefile
   python/branches/py3k/PC/os2emx/config.c
   python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj
   python/branches/py3k/Tools/scripts/README
Log:
Remove more hotshot cruft.

Modified: python/branches/py3k/PC/VC6/pythoncore.dsp
==============================================================================
--- python/branches/py3k/PC/VC6/pythoncore.dsp	(original)
+++ python/branches/py3k/PC/VC6/pythoncore.dsp	Sat Oct 13 20:56:00 2007
@@ -137,10 +137,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_hotshot.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\_localemodule.c
 # End Source File
 # Begin Source File

Modified: python/branches/py3k/PC/config.c
==============================================================================
--- python/branches/py3k/PC/config.c	(original)
+++ python/branches/py3k/PC/config.c	Sat Oct 13 20:56:00 2007
@@ -99,7 +99,6 @@
 
         {"_codecs", init_codecs},
 	{"_weakref", init_weakref},
-	{"_hotshot", init_hotshot},
 	{"_random", init_random},
         {"_bisect", init_bisect},
         {"_heapq", init_heapq},

Modified: python/branches/py3k/PC/os2emx/Makefile
==============================================================================
--- python/branches/py3k/PC/os2emx/Makefile	(original)
+++ python/branches/py3k/PC/os2emx/Makefile	Sat Oct 13 20:56:00 2007
@@ -437,8 +437,7 @@
 # Python modules to be dynamically loaded that need explicit build rules
 #  (either multiple source files and/or non-standard module naming)
 #  (NOTE: use shortened names for modules affected by 8 char name limit)
-HARDEXTMODULES=	_hotshot \
-		_socket \
+HARDEXTMODULES=	_socket \
 		_testcap \
 		unicoded
 
@@ -567,9 +566,6 @@
 # awkward handling (due e.g. to non-std naming, or multiple source files)
 # - standard modules
 
-_hotshot$(MODULE.EXT): $(OUT)_hotshot$O $(OUT)_hotshot_m.def $(PYTHON.IMPLIB)
-	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
-
 _socket$(MODULE.EXT): $(OUT)socketmodule$O $(OUT)_socket_m.def $(PYTHON.IMPLIB)
 	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
 

Modified: python/branches/py3k/PC/os2emx/config.c
==============================================================================
--- python/branches/py3k/PC/os2emx/config.c	(original)
+++ python/branches/py3k/PC/os2emx/config.c	Sat Oct 13 20:56:00 2007
@@ -75,7 +75,6 @@
 #if !HAVE_DYNAMIC_LOADING
 extern void init_curses();
 extern void init_curses_panel();
-extern void init_hotshot();
 extern void init_testcapi();
 extern void initbz2();
 extern void initfpectl();
@@ -134,7 +133,6 @@
 #if !HAVE_DYNAMIC_LOADING
 	{"_curses", init_curses},
 	{"_curses_panel", init_curses_panel},
-	{"_hotshot", init_hotshot},
 	{"_testcapi", init_testcapi},
 	{"bz2", initbz2},
 	{"fpectl", initfpectl},

Modified: python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj	(original)
+++ python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj	Sat Oct 13 20:56:00 2007
@@ -1414,10 +1414,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\_hotshot.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\_localemodule.c"
 				>
 			</File>

Modified: python/branches/py3k/Tools/scripts/README
==============================================================================
--- python/branches/py3k/Tools/scripts/README	(original)
+++ python/branches/py3k/Tools/scripts/README	Sat Oct 13 20:56:00 2007
@@ -30,7 +30,6 @@
 google.py		Open a webbrowser with Google.
 gprof2html.py		Transform gprof(1) output into useful HTML.
 h2py.py			Translate #define's into Python assignments
-hotshotmain.py		Main program to run script under control of hotshot
 idle			Main program to start IDLE
 ifdef.py		Remove #if(n)def groups from C sources
 lfcr.py			Change LF line endings to CRLF (Unix to Windows)


More information about the Python-3000-checkins mailing list