Issue 5682: Move _io module into its own subdirectory.

Reviewed by: Antoine Pitrou

diff --git a/Makefile.pre.in b/Makefile.pre.in
index dc1d197a8e931675d865f66b9f6dd1ac402a61eb..0025307a7a7330e30166cdc2a85bdf4606a8c1bf 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -193,15 +193,16 @@ MODULE_OBJS=      \
 # Used of signalmodule.o is not available
 SIGNAL_OBJS=   @SIGNAL_OBJS@
 
-IO_H=          Modules/_iomodule.h
+IO_H=          Modules/_io/_iomodule.h
 
 IO_OBJS=       \
-               Modules/io.o \
-               Modules/_iobase.o \
-               Modules/_fileio.o \
-               Modules/_bufferedio.o \
-               Modules/_textio.o \
-               Modules/_bytesio.o
+               Modules/_io/_iomodule.o \
+               Modules/_io/iobase.o \
+               Modules/_io/fileio.o \
+               Modules/_io/bufferedio.o \
+               Modules/_io/textio.o \
+               Modules/_io/bytesio.o \
+               Modules/_io/stringio.o
 
 ##########################################################################
 # Grammar

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index f8d3a838b3d159017bd5880db04cb05ab1ff44a1..824b614392af3f154f6010e249878a058262969c 100644 (file)
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -114,7 +114,7 @@ _codecs _codecsmodule.c             # access to the builtin codecs and codec registry
 _weakref _weakref.c            # weak references
 
 # Standard I/O baseline
-_io io.c _iobase.c _fileio.c _bytesio.c _bufferedio.c _textio.c _stringio.c
+_io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
 
 # The zipimport module is always imported at startup. Having it as a
 # builtin module avoids some bootstrapping problems and reduces overhead.

diff --git a/Modules/io.c b/Modules/_io/_iomodule.c
similarity index 100%
rename from Modules/io.c
rename to Modules/_io/_iomodule.c

diff --git a/Modules/_iomodule.h b/Modules/_io/_iomodule.h
similarity index 100%
rename from Modules/_iomodule.h
rename to Modules/_io/_iomodule.h

diff --git a/Modules/_bufferedio.c b/Modules/_io/bufferedio.c
similarity index 100%
rename from Modules/_bufferedio.c
rename to Modules/_io/bufferedio.c

diff --git a/Modules/_bytesio.c b/Modules/_io/bytesio.c
similarity index 100%
rename from Modules/_bytesio.c
rename to Modules/_io/bytesio.c

diff --git a/Modules/_fileio.c b/Modules/_io/fileio.c
similarity index 100%
rename from Modules/_fileio.c
rename to Modules/_io/fileio.c

diff --git a/Modules/_iobase.c b/Modules/_io/iobase.c
similarity index 100%
rename from Modules/_iobase.c
rename to Modules/_io/iobase.c

diff --git a/Modules/_stringio.c b/Modules/_io/stringio.c
similarity index 100%
rename from Modules/_stringio.c
rename to Modules/_io/stringio.c

diff --git a/Modules/_textio.c b/Modules/_io/textio.c
similarity index 100%
rename from Modules/_textio.c
rename to Modules/_io/textio.c

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 3803c03ccd8c0bf3d23542bc2a776fe97318a504..5640682b68632882cbc3a2840941cf24ef5fa363 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -97,14 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_bufferedio.c\r
-# 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
@@ -141,19 +133,39 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_fileio.c\r
+SOURCE=..\..\Modules\_functoolsmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_functoolsmodule.c\r
+SOURCE=..\..\Modules\_heapqmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_heapqmodule.c\r
+SOURCE=..\..\Modules\_io\bytesio.c\r
+# 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=..\..\Modules\_io\fileio.c\r
+# 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=..\..\Modules\_io\iobase.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_iobase.c\r
+SOURCE=..\..\Modules\_io\textio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\_io\_iomodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -181,10 +193,6 @@ SOURCE=..\..\Modules\_sre.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_stringio.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\_struct.c\r
 # End Source File\r
 # Begin Source File\r
@@ -193,10 +201,6 @@ SOURCE=..\..\PC\_subprocess.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_textio.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\_threadmodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -475,10 +479,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\io.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Objects\iterobject.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 a5df0d106203b76b12ea215ae118004d33945c2c..e24e5730b6c06c0f64aa63d3037f16bd9787dc18 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -273,6 +273,32 @@
        <References>
        </References>
        <Files>
+               <Filter
+                       Name="_io"
+            Filter="">
+                       <File
+                               RelativePath="..\..\Modules\_io\fileio.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\Modules\_io\bytesio.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\Modules\_io\stringio.c">
+                       </File>
+                       <File
+                           RelativePath="..\..\Modules\_io\bufferedio.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\Modules\_io\iobase.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\Modules\_io\textio.c">
+                       </File>
+                       <File
+                               RelativePath="..\..\Modules\_io\_iomodule.c">
+                       </File>
+               </Filter>
+
                <Filter
                        Name="zlib"
                        Filter="">
@@ -361,18 +387,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>
@@ -397,9 +417,6 @@
                <File
                        RelativePath="..\..\Modules\_sre.c">
                </File>
-               <File
-                       RelativePath="..\..\Modules\_stringio.c">
-               </File>
                <File
                        RelativePath="..\..\Modules\_struct.c">
                </File>

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 76fa47ec8d27c486ba2298e65273b4b19f3da3bf..88af248be25032e0fcbc48e6e7b862ec2e756731 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -986,30 +986,38 @@
                                RelativePath="..\..\Modules\_csv.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Modules\_fileio.c"
-                               >
-                       </File>
-                        <File
-                                RelativePath="..\..\Modules\_bytesio.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\_bufferedio.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\_iobase.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\_textio.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\Modules\io.c"
-                                >
-                        </File>                        
+                       <Filter
+                               Name="_io"
+                               >
+                               <File
+                                       RelativePath="..\..\Modules\_io\fileio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\Modules\_io\bytesio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\Modules\_io\stringio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\Modules\_io\bufferedio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\Modules\_io\iobase.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\Modules\_io\textio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\Modules\_io\_iomodule.c"
+                                       >
+                               </File>
+                       </Filter>
                        <File
                                RelativePath="..\..\Modules\_functoolsmodule.c"
                                >
@@ -1042,10 +1050,6 @@
                                RelativePath="..\..\Modules\_sre.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Modules\_stringio.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Modules\_struct.c"
                                >

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index dc64bfa7b712dbb1084a6cd820f19b84177b9c90..f8ba1f1ecc38a1744aaa40245aac0d98efb0eaf3 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -974,10 +974,6 @@
                                RelativePath="..\Modules\_bisectmodule.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\_bufferedio.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\_codecsmodule.c"
                                >
@@ -990,14 +986,6 @@
                                RelativePath="..\Modules\_csv.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\_fileio.c"
-                               >
-                       </File>
-                        <File
-                                RelativePath="..\Modules\_bytesio.c"
-                                >
-                        </File>
                        <File
                                RelativePath="..\Modules\_functoolsmodule.c"
                                >
@@ -1006,14 +994,6 @@
                                RelativePath="..\Modules\_heapqmodule.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\_iobase.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\_iomodule.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\_json.c"
                                >
@@ -1038,18 +1018,10 @@
                                RelativePath="..\Modules\_sre.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\_stringio.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\_struct.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\_textio.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\_weakref.c"
                                >
@@ -1090,10 +1062,6 @@
                                RelativePath="..\Modules\itertoolsmodule.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Modules\io.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Modules\main.c"
                                >
@@ -1170,6 +1138,42 @@
                                RelativePath="..\Modules\zlibmodule.c"
                                >
                        </File>
+                       <Filter
+                               Name="_io"
+                               >
+                               <File
+                                       RelativePath="..\Modules\_io\fileio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\bytesio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\stringio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\bufferedio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\iobase.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\textio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\_iomodule.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\_io\_iomodule.h"
+                                       >
+                               </File>
+                       </Filter>
                        <Filter
                                Name="zlib"
                                >