From e69041db56e42ab1c47188e427acc232d9f4fcea Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 14 Jun 2009 03:05:54 +0000
Subject: Updated MSVC files to follow r73394.

---
 PC/VC6/pythoncore.dsp      | 36 ++++++++++++++++++++++++++++--------
 PC/VS7.1/pythoncore.vcproj | 27 +++++++++++++++++++++------
 PC/VS8.0/pythoncore.vcproj | 44 ++++++++++++++++++++++++++++++++++++--------
 PC/config.c                |  7 +++----
 PCbuild/pythoncore.vcproj  | 44 ++++++++++++++++++++++++++++++++++++--------
 5 files changed, 124 insertions(+), 34 deletions(-)

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 2cae542..1d2415c 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -97,10 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_bytesio.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\cjkcodecs\_codecs_cn.c
 # End Source File
 # Begin Source File
@@ -137,10 +133,6 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_fileio.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\_functoolsmodule.c
 # End Source File
 # Begin Source File
@@ -153,6 +145,10 @@ SOURCE=..\..\Modules\_hotshot.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\_iomodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_json.c
 # End Source File
 # Begin Source File
@@ -237,6 +233,10 @@ SOURCE=..\..\Objects\boolobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\bufferedio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\bufferobject.c
 # End Source File
 # Begin Source File
@@ -245,6 +245,10 @@ SOURCE=..\..\Objects\bytearrayobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\bytesio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\bytes_methods.c
 # End Source File
 # Begin Source File
@@ -345,6 +349,10 @@ SOURCE=..\..\Objects\exceptions.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\fileio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\fileobject.c
 # End Source File
 # Begin Source File
@@ -442,6 +450,10 @@ SOURCE=..\..\Modules\zlib\gzio.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\iobase.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\imageop.c
 # End Source File
 # Begin Source File
@@ -671,6 +683,10 @@ SOURCE=..\..\Objects\sliceobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\stringio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\stringobject.c
 # End Source File
 # Begin Source File
@@ -699,6 +715,10 @@ SOURCE=..\..\Python\sysmodule.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_io\textio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Python\thread.c
 # End Source File
 # Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 2ee7555..1b50c0b 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -362,18 +362,12 @@
 			RelativePath="..\..\Modules\cjkcodecs\_codecs_tw.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\_bytesio.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\_codecsmodule.c">
 		</File>
 		<File
 			RelativePath="..\..\Modules\_csv.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\_fileio.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\_functoolsmodule.c">
 		</File>
 		<File
@@ -383,6 +377,9 @@
 			RelativePath="..\..\Modules\_hotshot.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\_iomodule.c">
+		</File>
+		<File
 			RelativePath="..\..\Modules\_json.c">
 		</File>
 		<File
@@ -443,12 +440,18 @@
 			RelativePath="..\..\Objects\boolobject.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\bufferedio.c">
+		</File>
+		<File
 			RelativePath="..\..\Objects\bufferobject.c">
 		</File>
 		<File
 			RelativePath="..\..\Objects\bytearrayobject.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\bytesio.c">
+		</File>
+		<File
 			RelativePath="..\..\Objects\stringobject.c">
 		</File>
 		<File
@@ -524,6 +527,9 @@
 			RelativePath="..\..\Objects\exceptions.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\fileio.c">
+		</File>
+		<File
 			RelativePath="..\..\Objects\fileobject.c">
 		</File>
 		<File
@@ -629,6 +635,9 @@
 			RelativePath="..\..\Objects\intobject.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\iobase.c">
+		</File>
+		<File
 			RelativePath="..\..\Objects\iterobject.c">
 		</File>
 		<File
@@ -773,6 +782,9 @@
 			RelativePath="..\..\Objects\sliceobject.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\stringio.c">
+		</File>
+		<File
 			RelativePath="..\..\Modules\stropmodule.c">
 		</File>
 		<File
@@ -791,6 +803,9 @@
 			RelativePath="..\..\Python\sysmodule.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_io\textio.c">
+		</File>
+		<File
 			RelativePath="..\..\Python\thread.c">
 		</File>
 		<File
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index db105ed..4e42531 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -999,14 +999,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\_fileio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Modules\_bytesio.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\_functoolsmodule.c"
 				>
 			</File>
@@ -1350,6 +1342,42 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="_io"
+				>
+				<File
+					RelativePath="..\..\Modules\_io\_iomodule.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\_iomodule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\bufferedio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\bytesio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\fileio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\iobase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\stringio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\textio.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Objects"
diff --git a/PC/config.c b/PC/config.c
index a5e1530..41f0573 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -52,8 +52,6 @@ extern void initparser(void);
 extern void init_winreg(void);
 extern void init_struct(void);
 extern void initdatetime(void);
-extern void init_fileio(void);
-extern void init_bytesio(void);
 extern void init_functools(void);
 extern void init_json(void);
 extern void initzlib(void);
@@ -68,6 +66,7 @@ extern void init_codecs_tw(void);
 extern void init_subprocess(void);
 extern void init_lsprof(void);
 extern void init_ast(void);
+extern void init_io(void);
 extern void _PyWarnings_Init(void);
 
 /* tools/freeze/makeconfig.py marker for additional "extern" */
@@ -132,8 +131,6 @@ struct _inittab _PyImport_Inittab[] = {
 	{"_winreg", init_winreg},
 	{"_struct", init_struct},
 	{"datetime", initdatetime},
-	{"_fileio", init_fileio},
-	{"_bytesio", init_bytesio},
 	{"_functools", init_functools},
 	{"_json", init_json},
 
@@ -166,6 +163,8 @@ struct _inittab _PyImport_Inittab[] = {
 	{"exceptions", NULL},
         {"_warnings", _PyWarnings_Init},
 
+        {"_io", init_io},
+
         /* Sentinel */
         {0, 0}
 };
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index bf4d724..06c1df5 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -999,14 +999,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_fileio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\Modules\_bytesio.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\_functoolsmodule.c"
 				>
 			</File>
@@ -1350,6 +1342,42 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="_io"
+				>
+				<File
+					RelativePath="..\Modules\_io\_iomodule.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\_iomodule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\bufferedio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\bytesio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\fileio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\iobase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\stringio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\_io\textio.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Objects"
-- 
cgit v0.12