[Python-3000-checkins] r64073 - in python/branches/py3k: PC/VC6/pythoncore.dsp PC/VS7.1/pythoncore.vcproj PC/VS8.0/pythoncore.vcproj PC/config.c PC/os2emx/Makefile PCbuild/pythoncore.vcproj

[thomas.heller]

Author: thomas.heller
Date: Tue Jun 10 17:01:24 2008
New Revision: 64073

Log:
Fix the Windows build by removing references to the cStringIO module
which no longer exists.


Modified:
   python/branches/py3k/PC/VC6/pythoncore.dsp
   python/branches/py3k/PC/VS7.1/pythoncore.vcproj
   python/branches/py3k/PC/VS8.0/pythoncore.vcproj
   python/branches/py3k/PC/config.c
   python/branches/py3k/PC/os2emx/Makefile
   python/branches/py3k/PCbuild/pythoncore.vcproj

Modified: python/branches/py3k/PC/VC6/pythoncore.dsp
==============================================================================
--- python/branches/py3k/PC/VC6/pythoncore.dsp	(original)
+++ python/branches/py3k/PC/VC6/pythoncore.dsp	Tue Jun 10 17:01:24 2008
@@ -293,10 +293,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\cStringIO.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\datetimemodule.c
 # End Source File
 # Begin Source File

Modified: python/branches/py3k/PC/VS7.1/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/pythoncore.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/pythoncore.vcproj	Tue Jun 10 17:01:24 2008
@@ -479,9 +479,6 @@
 			RelativePath="..\..\PC\config.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\cStringIO.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\datetimemodule.c">
 		</File>
 		<File

Modified: python/branches/py3k/PC/VS8.0/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PC/VS8.0/pythoncore.vcproj	(original)
+++ python/branches/py3k/PC/VS8.0/pythoncore.vcproj	Tue Jun 10 17:01:24 2008
@@ -990,10 +990,10 @@
 				RelativePath="..\..\Modules\_fileio.c"
 				>
 			</File>
-                        <File^M
-                                RelativePath="..\..\Modules\_bytesio.c"^M
-                                >^M
-                        </File>^M
+                        <File^M
+                                RelativePath="..\..\Modules\_bytesio.c"^M
+                                >^M
+                        </File>^M
 			<File
 				RelativePath="..\..\Modules\_functoolsmodule.c"
 				>
@@ -1051,10 +1051,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\cStringIO.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\datetimemodule.c"
 				>
 			</File>

Modified: python/branches/py3k/PC/config.c
==============================================================================
--- python/branches/py3k/PC/config.c	(original)
+++ python/branches/py3k/PC/config.c	Tue Jun 10 17:01:24 2008
@@ -23,7 +23,6 @@
 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 @@
 #ifdef WITH_THREAD
         {"_thread", init_thread},
 #endif
-        {"cStringIO", initcStringIO},
 #ifdef WIN32
         {"msvcrt", initmsvcrt},
         {"_locale", init_locale},

Modified: python/branches/py3k/PC/os2emx/Makefile
==============================================================================
--- python/branches/py3k/PC/os2emx/Makefile	(original)
+++ python/branches/py3k/PC/os2emx/Makefile	Tue Jun 10 17:01:24 2008
@@ -287,7 +287,6 @@
 		Modules/cmathmodule.c \
 		Modules/_codecsmodule.c \
 		Modules/collectionsmodule.c \
-		Modules/cStringIO.c \
 		Modules/_csv.c \
 		Modules/datetimemodule.c \
 		Modules/errnomodule.c \

Modified: python/branches/py3k/PCbuild/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/pythoncore.vcproj	(original)
+++ python/branches/py3k/PCbuild/pythoncore.vcproj	Tue Jun 10 17:01:24 2008
@@ -1055,10 +1055,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\cStringIO.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\datetimemodule.c"
 				>
 			</File>