Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue 5682: Move _io module into its own subdirectory. 

Reviewed by: Antoine Pitrou
This commit is contained in:
Alexandre Vassalotti 2009-04-04 19:58:40 +00:00
parent b4a49f69b0
commit 8d8d630003
14 changed files with 127 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.pre.in
View File

@ -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

2
Modules/Setup.dist
View File

@ -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.

0
Modules/io.c → Modules/_io/_iomodule.c
View File

0
Modules/_iomodule.h → Modules/_io/_iomodule.h
View File

0
Modules/_bufferedio.c → Modules/_io/bufferedio.c
View File

0
Modules/_bytesio.c → Modules/_io/bytesio.c
View File

0
Modules/_fileio.c → Modules/_io/fileio.c
View File

0
Modules/_iobase.c → Modules/_io/iobase.c
View File

0
Modules/_stringio.c → Modules/_io/stringio.c
View File

0
Modules/_textio.c → Modules/_io/textio.c
View File

50
PC/VC6/pythoncore.dsp
View File

@ -97,14 +97,6 @@ SOURCE=..\..\Modules\_bisectmodule.c
# End 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
# End Source File
# Begin Source File
@ -141,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,7 +141,31 @@ SOURCE=..\..\Modules\_heapqmodule.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_iobase.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
# Begin Source File
SOURCE=..\..\Modules\_io\textio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_io\_iomodule.c
# End Source File
# Begin Source File
@ -181,10 +193,6 @@ SOURCE=..\..\Modules\_sre.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_stringio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_struct.c
# End Source File
# Begin Source File
@ -193,10 +201,6 @@ SOURCE=..\..\PC\_subprocess.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_textio.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\_threadmodule.c
# End Source File
# Begin Source File
@ -475,10 +479,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c
# End Source File
# Begin Source File
SOURCE=..\..\Modules\io.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\iterobject.c
# End Source File
# Begin Source File

35
PC/VS7.1/pythoncore.vcproj
View File

@ -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>

58
PC/VS8.0/pythoncore.vcproj
View File

@ -986,30 +986,38 @@
RelativePath="..\..\Modules\_csv.c"
>
</File>
<File
RelativePath="..\..\Modules\_fileio.c"
<Filter
Name="_io"
>
</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>
<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"
>

68
PCbuild/pythoncore.vcproj
View File

@ -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"
>