Updated MSVC files to follow r73394.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 2cae542ae72b8ebf027e82bd0b62faf75440d120..1d2415cd8b421e3bdece38f7efbbe2c2e89671a3 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -97,10 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_bytesio.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\cjkcodecs\_codecs_cn.c\r
 # End Source File\r
 # Begin Source File\r
@@ -137,10 +133,6 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_fileio.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\_functoolsmodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -153,6 +145,10 @@ SOURCE=..\..\Modules\_hotshot.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\_iomodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_json.c\r
 # End Source File\r
 # Begin Source File\r
@@ -237,6 +233,10 @@ SOURCE=..\..\Objects\boolobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\bufferedio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\bufferobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -245,6 +245,10 @@ SOURCE=..\..\Objects\bytearrayobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\bytesio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\bytes_methods.c\r
 # End Source File\r
 # Begin Source File\r
@@ -345,6 +349,10 @@ SOURCE=..\..\Objects\exceptions.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\fileio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\fileobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -442,6 +450,10 @@ SOURCE=..\..\Modules\zlib\gzio.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\iobase.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\imageop.c\r
 # End Source File\r
 # Begin Source File\r
@@ -671,6 +683,10 @@ SOURCE=..\..\Objects\sliceobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\stringio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\stringobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -699,6 +715,10 @@ SOURCE=..\..\Python\sysmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_io\textio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Python\thread.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 2ee7555adfd41f7f523f24cf7443a5f8ce105750..1b50c0b6ead2c9800ecedcd0457ecb87d191659a 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -361,18 +361,12 @@
                <File
                        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>
@@ -382,6 +376,9 @@
                <File
                        RelativePath="..\..\Modules\_hotshot.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\_io\_iomodule.c">
+               </File>
                <File
                        RelativePath="..\..\Modules\_json.c">
                </File>
@@ -442,12 +439,18 @@
                <File
                        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>
@@ -523,6 +526,9 @@
                <File
                        RelativePath="..\..\Objects\exceptions.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\_io\fileio.c">
+               </File>
                <File
                        RelativePath="..\..\Objects\fileobject.c">
                </File>
@@ -628,6 +634,9 @@
                <File
                        RelativePath="..\..\Objects\intobject.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\_io\iobase.c">
+               </File>
                <File
                        RelativePath="..\..\Objects\iterobject.c">
                </File>
@@ -772,6 +781,9 @@
                <File
                        RelativePath="..\..\Objects\sliceobject.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\_io\stringio.c">
+               </File>
                <File
                        RelativePath="..\..\Modules\stropmodule.c">
                </File>
@@ -790,6 +802,9 @@
                <File
                        RelativePath="..\..\Python\sysmodule.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\_io\textio.c">
+               </File>
                <File
                        RelativePath="..\..\Python\thread.c">
                </File>

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index db105edd5224407c95ac42696762e1392f542e79..4e42531dbf4b4a202cd961ea95524ef36230f8c5 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -998,14 +998,6 @@
                                RelativePath="..\..\Modules\_csv.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Modules\_fileio.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Modules\_bytesio.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Modules\_functoolsmodule.c"
                                >
@@ -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 a5e153003f8084c0bbf2b093beb5a03fdde68d63..41f057349fde9cb000a99781b520565fc0f8783f 100644 (file)
--- 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 bf4d7246ca1a2e7736874329d976373cf02687a4..06c1df56d835df153c882fe960241b51e9fad81a 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -998,14 +998,6 @@
                                RelativePath="..\Modules\_csv.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\_fileio.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\_bytesio.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\_functoolsmodule.c"
                                >
@@ -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"