See SF# 1751801: Windows: Add the _fileio builtin module, and undefine

HAVE_FTRUNCATE because ftruncate does not exist on Windows.

diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index 3ca3172ae6251743b10c42f97a1f1a61bfc3355c..feae5130200aef3ff0b79b083be8bfcaa9c140b6 100644 (file)
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -22,7 +22,7 @@
 
 #ifdef MS_WINDOWS
 /* can simulate truncate with Win32 API functions; see file_truncate */
-#define HAVE_FTRUNCATE
+/* #define HAVE_FTRUNCATE */
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
@@ -581,6 +581,7 @@ fileio_tell(PyFileIOObject *self, PyObject *args)
        return portable_lseek(self->fd, NULL, 1);
 }
 
+#ifdef HAVE_FTRUNCATE
 static PyObject *
 fileio_truncate(PyFileIOObject *self, PyObject *args)
 {
@@ -629,6 +630,7 @@ fileio_truncate(PyFileIOObject *self, PyObject *args)
 
        return posobj;
 }
+#endif
 
 static char *
 mode_string(PyFileIOObject *self)
@@ -711,10 +713,12 @@ PyDoc_STRVAR(seek_doc,
 "\n"
 "Note that not all file objects are seekable.");
 
+#ifdef HAVE_FTRUNCATE
 PyDoc_STRVAR(truncate_doc,
 "truncate([size: int]) -> None.         Truncate the file to at most size bytes.\n"
 "\n"
 "Size defaults to the current file position, as returned by tell().");
+#endif
 
 PyDoc_STRVAR(tell_doc,
 "tell() -> int.         Current file position");
@@ -747,7 +751,9 @@ static PyMethodDef fileio_methods[] = {
        {"write",    (PyCFunction)fileio_write,    METH_VARARGS, write_doc},
        {"seek",     (PyCFunction)fileio_seek,     METH_VARARGS, seek_doc},
        {"tell",     (PyCFunction)fileio_tell,     METH_VARARGS, tell_doc},
+#ifdef HAVE_FTRUNCATE
        {"truncate", (PyCFunction)fileio_truncate, METH_VARARGS, truncate_doc},
+#endif
        {"close",    (PyCFunction)fileio_close,    METH_NOARGS,  close_doc},
        {"seekable", (PyCFunction)fileio_seekable, METH_NOARGS,  seekable_doc},
        {"readable", (PyCFunction)fileio_readable, METH_NOARGS,  readable_doc},

diff --git a/PC/config.c b/PC/config.c
index 8ca8cef00b01ed15d9f8aa38dc59425721fd7415..68fa84f6aae0d69359792be1333b6478adb15004 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -59,6 +59,7 @@ extern void init_subprocess(void);
 extern void init_lsprof(void);
 extern void init_ast(void);
 extern void init_types(void);
+extern void init_fileio(void);
 
 /* tools/freeze/makeconfig.py marker for additional "extern" */
 /* -- ADDMODULE MARKER 1 -- */
@@ -145,6 +146,7 @@ struct _inittab _PyImport_Inittab[] = {
         {"sys", NULL},
         
         {"_types", init_types},
+        {"_fileio", init_fileio},
 
         /* Sentinel */
         {0, 0}

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 2de1611f987ad067ec006c17d1cf4d97323232e6..1da5593c731d3c2c2ba1a35e4eee666c021da0d6 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -370,6 +370,9 @@
                <File
                        RelativePath="..\Modules\_csv.c">
                </File>
+               <File
+                       RelativePath="..\Modules\_fileio.c">
+               </File>
                <File
                        RelativePath="..\Modules\_functoolsmodule.c">
                </File>