Remove last traces of cStringIO.
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 2d34d12..b8c0ffe 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -691,10 +691,6 @@
>
</File>
<File
- RelativePath="..\..\Include\cStringIO.h"
- >
- </File>
- <File
RelativePath="..\..\Include\datetime.h"
>
</File>
diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c
index 93fbecc..88ece9d 100644
--- a/PC/os2emx/config.c
+++ b/PC/os2emx/config.c
@@ -50,7 +50,6 @@
extern void init_weakref();
extern void initarray();
extern void initbinascii();
-extern void initcStringIO();
extern void initcollections();
extern void initcmath();
extern void initdatetime();
@@ -110,7 +109,6 @@
{"_weakref", init_weakref},
{"array", initarray},
{"binascii", initbinascii},
- {"cStringIO", initcStringIO},
{"collections", initcollections},
{"cmath", initcmath},
{"datetime", initdatetime},
diff --git a/PC/os2emx/python26.def b/PC/os2emx/python26.def
index 3cdb44a..46c548e 100644
--- a/PC/os2emx/python26.def
+++ b/PC/os2emx/python26.def
@@ -1218,9 +1218,6 @@
; "initcPickle"
; "fast_save_leave"
-; From python26_s.lib(cStringIO)
-; "initcStringIO"
-
; From python26_s.lib(_csv)
; "init_csv"
diff --git a/PC/os2vacpp/config.c b/PC/os2vacpp/config.c
index aba6e79..bbdf6f3 100644
--- a/PC/os2vacpp/config.c
+++ b/PC/os2vacpp/config.c
@@ -34,7 +34,6 @@
extern void initstruct(void);
extern void inittime(void);
extern void init_thread(void);
-extern void initcStringIO(void);
extern void initpcre(void);
#ifdef WIN32
extern void initmsvcrt(void);
@@ -78,7 +77,6 @@
#ifdef WITH_THREAD
{"_thread", init_thread},
#endif
- {"cStringIO", initcStringIO},
{"pcre", initpcre},
#ifdef WIN32
{"msvcrt", initmsvcrt},
diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile
index 55bb783..d47ff1f 100644
--- a/PC/os2vacpp/makefile
+++ b/PC/os2vacpp/makefile
@@ -180,7 +180,6 @@
$(PATHOBJ)\ArrayModule.obj \
$(PATHOBJ)\BinAscii.obj \
$(PATHOBJ)\CMathModule.obj \
- $(PATHOBJ)\cStringIO.obj \
$(PATHOBJ)\ErrnoModule.obj \
$(PATHOBJ)\GCModule.obj \
$(PATHOBJ)\GetBuildInfo.obj \
@@ -440,7 +439,7 @@
cpickle.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \
$(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \
- $(PY_INCLUDE)\cstringio.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
+ $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
$(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
$(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \
$(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \
@@ -466,20 +465,6 @@
$(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \
$(PY_INCLUDE)\tupleobject.h
-cstringio.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \
- $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \
- $(PY_INCLUDE)\cstringio.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
- $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
- $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \
- $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \
- $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \
- $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h \
- $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h \
- $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h \
- $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \
- $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \
- $(PY_INCLUDE)\tupleobject.h
-
cursesmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
$(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk
index 7083c78..4f7f478 100644
--- a/PC/os2vacpp/makefile.omk
+++ b/PC/os2vacpp/makefile.omk
@@ -142,7 +142,6 @@
ArrayModule.obj \
BinAscii.obj \
CMathModule.obj \
- cStringIO.obj \
ErrnoModule.obj \
GetBuildInfo.obj \
GetPathP.obj \
@@ -379,7 +378,7 @@
stringobject.h sysmodule.h traceback.h tupleobject.h
cpickle.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
- pyconfig.h cstringio.h dictobject.h fileobject.h floatobject.h \
+ pyconfig.h dictobject.h fileobject.h floatobject.h \
funcobject.h import.h intobject.h intrcheck.h listobject.h \
longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \
mymath.h myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \
@@ -394,14 +393,6 @@
pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
traceback.h tupleobject.h
-cstringio.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
- pyconfig.h cstringio.h dictobject.h fileobject.h floatobject.h \
- funcobject.h import.h intobject.h intrcheck.h listobject.h \
- longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \
- myproto.h object.h objimpl.h pydebug.h pyerrors.h pyfpe.h \
- pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \
- stringobject.h sysmodule.h traceback.h tupleobject.h
-
cursesmodule.obj: abstract.h ceval.h classobject.h cobject.h \
complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
funcobject.h import.h intobject.h intrcheck.h listobject.h \