summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-10-13 18:56:00 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-10-13 18:56:00 (GMT)
commitc05d384bf71f3148ab06007ab17f9e8b1f0a6f84 (patch)
tree785caaf5f0cd129e76d1024581346fa7ab085409
parentfe9bed02e430613f95849fa49aaa4f823a762738 (diff)
downloadcpython-c05d384bf71f3148ab06007ab17f9e8b1f0a6f84.zip
cpython-c05d384bf71f3148ab06007ab17f9e8b1f0a6f84.tar.gz
cpython-c05d384bf71f3148ab06007ab17f9e8b1f0a6f84.tar.bz2
Remove more hotshot cruft.
-rw-r--r--PC/VC6/pythoncore.dsp4
-rw-r--r--PC/config.c1
-rw-r--r--PC/os2emx/Makefile6
-rw-r--r--PC/os2emx/config.c2
-rw-r--r--PCbuild8/pythoncore/pythoncore.vcproj4
-rw-r--r--Tools/scripts/README1
6 files changed, 1 insertions, 17 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index e61e280..3478561 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -137,10 +137,6 @@ SOURCE=..\..\Modules\_heapqmodule.c
# 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
diff --git a/PC/config.c b/PC/config.c
index ac2d067..c74b2e4 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -99,7 +99,6 @@ struct _inittab _PyImport_Inittab[] = {
{"_codecs", init_codecs},
{"_weakref", init_weakref},
- {"_hotshot", init_hotshot},
{"_random", init_random},
{"_bisect", init_bisect},
{"_heapq", init_heapq},
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index bb32bc5..c0c9807 100644
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -437,8 +437,7 @@ EASYEXTMODULES= fpectl \
# 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 @@ $(PGEN.EXE): $(OBJ.PGEN) $(OUT)pgen.def
# 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)
diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c
index 529fe2c..3524429 100644
--- a/PC/os2emx/config.c
+++ b/PC/os2emx/config.c
@@ -75,7 +75,6 @@ extern void initzipimport();
#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 @@ struct _inittab _PyImport_Inittab[] = {
#if !HAVE_DYNAMIC_LOADING
{"_curses", init_curses},
{"_curses_panel", init_curses_panel},
- {"_hotshot", init_hotshot},
{"_testcapi", init_testcapi},
{"bz2", initbz2},
{"fpectl", initfpectl},
diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index c49105e..f11f57e 100644
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -1414,10 +1414,6 @@
>
</File>
<File
- RelativePath="..\..\Modules\_hotshot.c"
- >
- </File>
- <File
RelativePath="..\..\Modules\_localemodule.c"
>
</File>
diff --git a/Tools/scripts/README b/Tools/scripts/README
index 9c7b40e..f5c9791 100644
--- a/Tools/scripts/README
+++ b/Tools/scripts/README
@@ -30,7 +30,6 @@ ftpmirror.py FTP mirror script
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)