Skip to content

C
cpython
Commit 8d8d6300 authored by Alexandre Vassalotti's avatar Alexandre Vassalotti
Browse files
Options

Issue 5682: Move _io module into its own subdirectory. 

Reviewed by: Antoine Pitrou
parent b4a49f69
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 101 deletions
Makefile.pre.in
View file @ 8d8d6300
...@@ -193,15 +193,16 @@ MODULE_OBJS= \ ...@@ -193,15 +193,16 @@ MODULE_OBJS= \
# Used of signalmodule.o is not available # Used of signalmodule.o is not available
SIGNAL_OBJS= @SIGNAL_OBJS@ SIGNAL_OBJS= @SIGNAL_OBJS@
IO_H= Modules/_iomodule.h IO_H= Modules/_io/_iomodule.h
IO_OBJS= \ IO_OBJS= \
Modules/io.o \ Modules/_io/_iomodule.o \
Modules/_iobase.o \ Modules/_io/iobase.o \
Modules/_fileio.o \ Modules/_io/fileio.o \
Modules/_bufferedio.o \ Modules/_io/bufferedio.o \
Modules/_textio.o \ Modules/_io/textio.o \
Modules/_bytesio.o Modules/_io/bytesio.o \
Modules/_io/stringio.o
########################################################################## ##########################################################################
# Grammar # Grammar
......
Modules/Setup.dist
View file @ 8d8d6300
...@@ -114,7 +114,7 @@ _codecs _codecsmodule.c # access to the builtin codecs and codec registry ...@@ -114,7 +114,7 @@ _codecs _codecsmodule.c # access to the builtin codecs and codec registry
_weakref _weakref.c # weak references _weakref _weakref.c # weak references
# Standard I/O baseline # 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 # The zipimport module is always imported at startup. Having it as a
# builtin module avoids some bootstrapping problems and reduces overhead. # builtin module avoids some bootstrapping problems and reduces overhead.
......
PC/VC6/pythoncore.dsp
View file @ 8d8d6300
...@@ -97,14 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c ...@@ -97,14 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_bufferedio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_bytesio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\cjkcodecs\_codecs_cn.c SOURCE=..\..\Modules\cjkcodecs\_codecs_cn.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -141,19 +133,39 @@ SOURCE=..\..\Modules\_csv.c ...@@ -141,19 +133,39 @@ SOURCE=..\..\Modules\_csv.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_fileio.c SOURCE=..\..\Modules\_functoolsmodule.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_functoolsmodule.c SOURCE=..\..\Modules\_heapqmodule.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_heapqmodule.c SOURCE=..\..\Modules\_io\bytesio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_io\stringio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_io\fileio.c
# End Source File
# Begin Source File
SOURCE="..\..\Modules\_io\bufferedio.c"
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_io\iobase.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_iobase.c SOURCE=..\..\Modules\_io\textio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_io\_iomodule.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -181,10 +193,6 @@ SOURCE=..\..\Modules\_sre.c ...@@ -181,10 +193,6 @@ SOURCE=..\..\Modules\_sre.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_stringio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_struct.c SOURCE=..\..\Modules\_struct.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -193,10 +201,6 @@ SOURCE=..\..\PC\_subprocess.c ...@@ -193,10 +201,6 @@ SOURCE=..\..\PC\_subprocess.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\_textio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_threadmodule.c SOURCE=..\..\Modules\_threadmodule.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -475,10 +479,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c ...@@ -475,10 +479,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\Modules\io.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\iterobject.c SOURCE=..\..\Objects\iterobject.c
# End Source File # End Source File
# Begin Source File # Begin Source File
......
PC/VS7.1/pythoncore.vcproj
View file @ 8d8d6300
...@@ -273,6 +273,32 @@ ...@@ -273,6 +273,32 @@
<References> <References>
</References> </References>
<Files> <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 <Filter
Name="zlib" Name="zlib"
Filter=""> Filter="">
...@@ -361,18 +387,12 @@ ...@@ -361,18 +387,12 @@
<File <File
RelativePath="..\..\Modules\cjkcodecs\_codecs_tw.c"> RelativePath="..\..\Modules\cjkcodecs\_codecs_tw.c">
</File> </File>
<File
RelativePath="..\..\Modules\_bytesio.c">
</File>
<File <File
RelativePath="..\..\Modules\_codecsmodule.c"> RelativePath="..\..\Modules\_codecsmodule.c">
</File> </File>
<File <File
RelativePath="..\..\Modules\_csv.c"> RelativePath="..\..\Modules\_csv.c">
</File> </File>
<File
RelativePath="..\..\Modules\_fileio.c">
</File>
<File <File
RelativePath="..\..\Modules\_functoolsmodule.c"> RelativePath="..\..\Modules\_functoolsmodule.c">
</File> </File>
...@@ -397,9 +417,6 @@ ...@@ -397,9 +417,6 @@
<File <File
RelativePath="..\..\Modules\_sre.c"> RelativePath="..\..\Modules\_sre.c">
</File> </File>
<File
RelativePath="..\..\Modules\_stringio.c">
</File>
<File <File
RelativePath="..\..\Modules\_struct.c"> RelativePath="..\..\Modules\_struct.c">
</File> </File>
......
PC/VS8.0/pythoncore.vcproj
View file @ 8d8d6300
...@@ -986,30 +986,38 @@ ...@@ -986,30 +986,38 @@
RelativePath="..\..\Modules\_csv.c" RelativePath="..\..\Modules\_csv.c"
> >
</File> </File>
<File <Filter
RelativePath="..\..\Modules\_fileio.c" Name="_io"
> >
</File> <File
<File RelativePath="..\..\Modules\_io\fileio.c"
RelativePath="..\..\Modules\_bytesio.c" >
> </File>
</File> <File
<File RelativePath="..\..\Modules\_io\bytesio.c"
RelativePath="..\..\Modules\_bufferedio.c" >
> </File>
</File> <File
<File RelativePath="..\..\Modules\_io\stringio.c"
RelativePath="..\..\Modules\_iobase.c" >
> </File>
</File> <File
<File RelativePath="..\..\Modules\_io\bufferedio.c"
RelativePath="..\..\Modules\_textio.c" >
> </File>
</File> <File
<File RelativePath="..\..\Modules\_io\iobase.c"
RelativePath="..\..\Modules\io.c" >
> </File>
</File> <File
RelativePath="..\..\Modules\_io\textio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.c"
>
</File>
</Filter>
<File <File
RelativePath="..\..\Modules\_functoolsmodule.c" RelativePath="..\..\Modules\_functoolsmodule.c"
> >
...@@ -1042,10 +1050,6 @@ ...@@ -1042,10 +1050,6 @@
RelativePath="..\..\Modules\_sre.c" RelativePath="..\..\Modules\_sre.c"
> >
</File> </File>
<File
RelativePath="..\..\Modules\_stringio.c"
>
</File>
<File <File
RelativePath="..\..\Modules\_struct.c" RelativePath="..\..\Modules\_struct.c"
> >
......
PCbuild/pythoncore.vcproj
View file @ 8d8d6300
...@@ -974,10 +974,6 @@ ...@@ -974,10 +974,6 @@
RelativePath="..\Modules\_bisectmodule.c" RelativePath="..\Modules\_bisectmodule.c"
> >
</File> </File>
<File
RelativePath="..\Modules\_bufferedio.c"
>
</File>
<File <File
RelativePath="..\Modules\_codecsmodule.c" RelativePath="..\Modules\_codecsmodule.c"
> >
...@@ -990,14 +986,6 @@ ...@@ -990,14 +986,6 @@
RelativePath="..\Modules\_csv.c" RelativePath="..\Modules\_csv.c"
> >
</File> </File>
<File
RelativePath="..\Modules\_fileio.c"
>
</File>
<File
RelativePath="..\Modules\_bytesio.c"
>
</File>
<File <File
RelativePath="..\Modules\_functoolsmodule.c" RelativePath="..\Modules\_functoolsmodule.c"
> >
...@@ -1006,14 +994,6 @@ ...@@ -1006,14 +994,6 @@
RelativePath="..\Modules\_heapqmodule.c" RelativePath="..\Modules\_heapqmodule.c"
> >
</File> </File>
<File
RelativePath="..\Modules\_iobase.c"
>
</File>
<File
RelativePath="..\Modules\_iomodule.h"
>
</File>
<File <File
RelativePath="..\Modules\_json.c" RelativePath="..\Modules\_json.c"
> >
...@@ -1038,18 +1018,10 @@ ...@@ -1038,18 +1018,10 @@
RelativePath="..\Modules\_sre.c" RelativePath="..\Modules\_sre.c"
> >
</File> </File>
<File
RelativePath="..\Modules\_stringio.c"
>
</File>
<File <File
RelativePath="..\Modules\_struct.c" RelativePath="..\Modules\_struct.c"
> >
</File> </File>
<File
RelativePath="..\Modules\_textio.c"
>
</File>
<File <File
RelativePath="..\Modules\_weakref.c" RelativePath="..\Modules\_weakref.c"
> >
...@@ -1090,10 +1062,6 @@ ...@@ -1090,10 +1062,6 @@
RelativePath="..\Modules\itertoolsmodule.c" RelativePath="..\Modules\itertoolsmodule.c"
> >
</File> </File>
<File
RelativePath="..\Modules\io.c"
>
</File>
<File <File
RelativePath="..\Modules\main.c" RelativePath="..\Modules\main.c"
> >
...@@ -1170,6 +1138,42 @@ ...@@ -1170,6 +1138,42 @@
RelativePath="..\Modules\zlibmodule.c" RelativePath="..\Modules\zlibmodule.c"
> >
</File> </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 <Filter
Name="zlib" Name="zlib"
> >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7