summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.pre.in15
-rw-r--r--Modules/Setup.dist2
-rw-r--r--Modules/_io/_iomodule.c (renamed from Modules/io.c)0
-rw-r--r--Modules/_io/_iomodule.h (renamed from Modules/_iomodule.h)0
-rw-r--r--Modules/_io/bufferedio.c (renamed from Modules/_bufferedio.c)0
-rw-r--r--Modules/_io/bytesio.c (renamed from Modules/_bytesio.c)0
-rw-r--r--Modules/_io/fileio.c (renamed from Modules/_fileio.c)0
-rw-r--r--Modules/_io/iobase.c (renamed from Modules/_iobase.c)0
-rw-r--r--Modules/_io/stringio.c (renamed from Modules/_stringio.c)0
-rw-r--r--Modules/_io/textio.c (renamed from Modules/_textio.c)0
-rw-r--r--PC/VC6/pythoncore.dsp48
-rw-r--r--PC/VS7.1/pythoncore.vcproj35
-rw-r--r--PC/VS8.0/pythoncore.vcproj60
-rw-r--r--PCbuild/pythoncore.vcproj68
14 files changed, 127 insertions, 101 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index dc1d197..0025307 100644
--- 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 f8d3a83..824b614 100644
--- 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
index 58b5798..58b5798 100644
--- a/Modules/io.c
+++ b/Modules/_io/_iomodule.c
diff --git a/Modules/_iomodule.h b/Modules/_io/_iomodule.h
index a44f127..a44f127 100644
--- a/Modules/_iomodule.h
+++ b/Modules/_io/_iomodule.h
diff --git a/Modules/_bufferedio.c b/Modules/_io/bufferedio.c
index 9960dba..9960dba 100644
--- a/Modules/_bufferedio.c
+++ b/Modules/_io/bufferedio.c
diff --git a/Modules/_bytesio.c b/Modules/_io/bytesio.c
index 0068cb7..0068cb7 100644
--- a/Modules/_bytesio.c
+++ b/Modules/_io/bytesio.c
diff --git a/Modules/_fileio.c b/Modules/_io/fileio.c
index c0f5c90..c0f5c90 100644
--- a/Modules/_fileio.c
+++ b/Modules/_io/fileio.c
diff --git a/Modules/_iobase.c b/Modules/_io/iobase.c
index ef6d516..ef6d516 100644
--- a/Modules/_iobase.c
+++ b/Modules/_io/iobase.c
diff --git a/Modules/_stringio.c b/Modules/_io/stringio.c
index d75a604..d75a604 100644
--- a/Modules/_stringio.c
+++ b/Modules/_io/stringio.c
diff --git a/Modules/_textio.c b/Modules/_io/textio.c
index cc229a8..cc229a8 100644
--- a/Modules/_textio.c
+++ b/Modules/_io/textio.c
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 3803c03..5640682 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -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,19 +133,39 @@ SOURCE=..\..\Modules\_csv.c
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\_fileio.c
+SOURCE=..\..\Modules\_functoolsmodule.c
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\_functoolsmodule.c
+SOURCE=..\..\Modules\_heapqmodule.c
# End 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
# 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
# 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
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index a5df0d1..e24e573 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -274,6 +274,32 @@
</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="">
<File
@@ -362,18 +388,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
@@ -398,9 +418,6 @@
RelativePath="..\..\Modules\_sre.c">
</File>
<File
- RelativePath="..\..\Modules\_stringio.c">
- </File>
- <File
RelativePath="..\..\Modules\_struct.c">
</File>
<File
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 76fa47e..88af248 100644
--- 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"
>
@@ -1043,10 +1051,6 @@
>
</File>
<File
- RelativePath="..\..\Modules\_stringio.c"
- >
- </File>
- <File
RelativePath="..\..\Modules\_struct.c"
>
</File>
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index dc64bfa..f8ba1f1 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -975,10 +975,6 @@
>
</File>
<File
- RelativePath="..\Modules\_bufferedio.c"
- >
- </File>
- <File
RelativePath="..\Modules\_codecsmodule.c"
>
</File>
@@ -991,14 +987,6 @@
>
</File>
<File
- RelativePath="..\Modules\_fileio.c"
- >
- </File>
- <File
- RelativePath="..\Modules\_bytesio.c"
- >
- </File>
- <File
RelativePath="..\Modules\_functoolsmodule.c"
>
</File>
@@ -1007,14 +995,6 @@
>
</File>
<File
- RelativePath="..\Modules\_iobase.c"
- >
- </File>
- <File
- RelativePath="..\Modules\_iomodule.h"
- >
- </File>
- <File
RelativePath="..\Modules\_json.c"
>
</File>
@@ -1039,18 +1019,10 @@
>
</File>
<File
- RelativePath="..\Modules\_stringio.c"
- >
- </File>
- <File
RelativePath="..\Modules\_struct.c"
>
</File>
<File
- RelativePath="..\Modules\_textio.c"
- >
- </File>
- <File
RelativePath="..\Modules\_weakref.c"
>
</File>
@@ -1091,10 +1063,6 @@
>
</File>
<File
- RelativePath="..\Modules\io.c"
- >
- </File>
- <File
RelativePath="..\Modules\main.c"
>
</File>
@@ -1171,6 +1139,42 @@
>
</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"
>
<File
generated by cgit v0.12 at 2024-12-03 21:58:45 (GMT)