Fix the Windows build by removing references to the cStringIO module

which no longer exists.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 035a11da594ea2be2cb53abee8975c2bb51cb693..e919620000fccceddc69ed618dc3d7dfdbfcd0e9 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -293,10 +293,6 @@ SOURCE=..\..\Modules\zlib\crc32.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\cStringIO.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\datetimemodule.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 8692e7a36c54c1862696b73ac32f421d87b06e06..4865e11a779c40eade87fed3747c604f5a090e44 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -478,9 +478,6 @@
                <File
                        RelativePath="..\..\PC\config.c">
                </File>
-               <File
-                       RelativePath="..\..\Modules\cStringIO.c">
-               </File>
                <File
                        RelativePath="..\..\Modules\datetimemodule.c">
                </File>

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index c2eb3561f7c756f902766ec510c2ca34e141b7fd..2d34d12485cf033bcf09c5e0b879065cacbdd1e3 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -990,10 +990,10 @@
                                RelativePath="..\..\Modules\_fileio.c"\r
                                >\r
                        </File>\r
-                        <File^M
-                                RelativePath="..\..\Modules\_bytesio.c"^M
-                                >^M
-                        </File>^M
+                        <File^M\r
+                                RelativePath="..\..\Modules\_bytesio.c"^M\r
+                                >^M\r
+                        </File>^M\r
                        <File\r
                                RelativePath="..\..\Modules\_functoolsmodule.c"\r
                                >\r
@@ -1050,10 +1050,6 @@
                                RelativePath="..\..\Modules\cmathmodule.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\cStringIO.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\datetimemodule.c"\r
                                >\r

diff --git a/PC/config.c b/PC/config.c
index 23dbc6453f8cf25eb42f425961cd3e8036b2f5f5..4269aa576bf549f46dbde27420c6ac5dc9a2006d 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -23,7 +23,6 @@ extern void init_sha256(void);
 extern void init_sha512(void);
 extern void inittime(void);
 extern void init_thread(void);
-extern void initcStringIO(void);
 #ifdef WIN32
 extern void initmsvcrt(void);
 extern void init_locale(void);
@@ -95,7 +94,6 @@ struct _inittab _PyImport_Inittab[] = {
 #ifdef WITH_THREAD
         {"_thread", init_thread},
 #endif
-        {"cStringIO", initcStringIO},
 #ifdef WIN32
         {"msvcrt", initmsvcrt},
         {"_locale", init_locale},

diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 10cadf950ebf14196dcf0757269144354a7536e1..8b4c404f5616d7a756c38657553982728a151ccb 100644 (file)
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -287,7 +287,6 @@ SRC.MODULES=        $(addprefix $(TOP), \
                Modules/cmathmodule.c \
                Modules/_codecsmodule.c \
                Modules/collectionsmodule.c \
-               Modules/cStringIO.c \
                Modules/_csv.c \
                Modules/datetimemodule.c \
                Modules/errnomodule.c \

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 5cb0e35ba0e18b701d4bbc29351458c1a4f098ef..d8771159d0ee4122d72b139501fb3cc3888da0ff 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1054,10 +1054,6 @@
                                RelativePath="..\Modules\cmathmodule.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\cStringIO.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\datetimemodule.c"
                                >