[Python-checkins] cpython: Issue #23753: Python doesn't support anymore platforms without stat() or
victor.stinner
python-checkins at python.org
Tue Mar 24 10:29:49 CET 2015
https://hg.python.org/cpython/rev/a84eae63b4cd
changeset: 95149:a84eae63b4cd
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Mar 24 10:27:50 2015 +0100
summary:
Issue #23753: Python doesn't support anymore platforms without stat() or
fstat(), these functions are always required.
Remove HAVE_STAT and HAVE_FSTAT defines, and stop supporting DONT_HAVE_STAT and
DONT_HAVE_FSTAT.
files:
Include/fileutils.h | 6 ------
Include/pyport.h | 22 ----------------------
Misc/NEWS | 5 ++++-
Modules/_io/fileio.c | 20 --------------------
Modules/mmapmodule.c | 4 ----
Python/fileutils.c | 16 ----------------
Python/marshal.c | 4 ----
7 files changed, 4 insertions(+), 73 deletions(-)
diff --git a/Include/fileutils.h b/Include/fileutils.h
--- a/Include/fileutils.h
+++ b/Include/fileutils.h
@@ -15,14 +15,11 @@
const wchar_t *text,
size_t *error_pos);
-#if defined(HAVE_STAT) && !defined(MS_WINDOWS)
PyAPI_FUNC(int) _Py_wstat(
const wchar_t* path,
struct stat *buf);
-#endif
#ifndef Py_LIMITED_API
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
#ifdef MS_WINDOWS
struct _Py_stat_struct {
@@ -49,14 +46,11 @@
PyAPI_FUNC(int) _Py_fstat(
int fd,
struct _Py_stat_struct *stat);
-#endif /* HAVE_FSTAT || MS_WINDOWS */
#endif /* Py_LIMITED_API */
-#ifdef HAVE_STAT
PyAPI_FUNC(int) _Py_stat(
PyObject *path,
struct stat *statbuf);
-#endif /* HAVE_STAT */
#ifndef Py_LIMITED_API
PyAPI_FUNC(int) _Py_open(
diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -357,28 +357,6 @@
* stat() and fstat() fiddling *
*******************************/
-/* We expect that stat and fstat exist on most systems.
- * It's confirmed on Unix, Mac and Windows.
- * If you don't have them, add
- * #define DONT_HAVE_STAT
- * and/or
- * #define DONT_HAVE_FSTAT
- * to your pyconfig.h. Python code beyond this should check HAVE_STAT and
- * HAVE_FSTAT instead.
- * Also
- * #define HAVE_SYS_STAT_H
- * if <sys/stat.h> exists on your platform, and
- * #define HAVE_STAT_H
- * if <stat.h> does.
- */
-#ifndef DONT_HAVE_STAT
-#define HAVE_STAT
-#endif
-
-#ifndef DONT_HAVE_FSTAT
-#define HAVE_FSTAT
-#endif
-
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#elif defined(HAVE_STAT_H)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #23753: Python doesn't support anymore platforms without stat() or
+ fstat(), these functions are always required.
+
- Issue #23681: The -b option now affects comparisons of bytes with int.
- Issue #23632: Memoryviews now allow tuple indexing (including for
@@ -29,7 +32,7 @@
- Issue #23657: Avoid explicit checks for str in zipapp, adding support
for pathlib.Path objects as arguments.
-
+
- Issue #23688: Added support of arbitrary bytes-like objects and avoided
unnecessary copying of memoryview in gzip.GzipFile.write().
Original patch by Wolfgang Maier.
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -180,7 +180,6 @@
static int
check_fd(int fd)
{
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
struct _Py_stat_struct buf;
if (_Py_fstat(fd, &buf) < 0 &&
#ifdef MS_WINDOWS
@@ -197,7 +196,6 @@
Py_XDECREF(exc);
return -1;
}
-#endif
return 0;
}
@@ -228,9 +226,7 @@
#elif !defined(MS_WINDOWS)
int *atomic_flag_works = NULL;
#endif
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
struct _Py_stat_struct fdfstat;
-#endif
int async_err = 0;
assert(PyFileIO_Check(oself));
@@ -427,7 +423,6 @@
}
self->blksize = DEFAULT_BUFFER_SIZE;
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
if (_Py_fstat(self->fd, &fdfstat) < 0) {
PyErr_SetFromErrno(PyExc_OSError);
goto error;
@@ -446,7 +441,6 @@
if (fdfstat.st_blksize > 1)
self->blksize = fdfstat.st_blksize;
#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
-#endif /* HAVE_FSTAT || MS_WINDOWS */
#if defined(MS_WINDOWS) || defined(__CYGWIN__)
/* don't translate newlines (\r\n <=> \n) */
@@ -597,8 +591,6 @@
return PyLong_FromSsize_t(n);
}
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
-
static size_t
new_buffersize(fileio *self, size_t currentsize)
{
@@ -702,18 +694,6 @@
return result;
}
-#else
-
-static PyObject *
-fileio_readall(fileio *self)
-{
- _Py_IDENTIFIER(readall);
- return _PyObject_CallMethodId((PyObject*)&PyRawIOBase_Type,
- &PyId_readall, "O", self);
-}
-
-#endif /* HAVE_FSTAT || MS_WINDOWS */
-
static PyObject *
fileio_read(fileio *self, PyObject *args)
{
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1112,9 +1112,7 @@
static PyObject *
new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
{
-#ifdef HAVE_FSTAT
struct _Py_stat_struct st;
-#endif
mmap_object *m_obj;
PyObject *map_size_obj = NULL;
Py_ssize_t map_size;
@@ -1179,7 +1177,6 @@
if (fd != -1)
(void)fcntl(fd, F_FULLFSYNC);
#endif
-#ifdef HAVE_FSTAT
if (fd != -1 && _Py_fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
if (map_size == 0) {
if (st.st_size == 0) {
@@ -1204,7 +1201,6 @@
return NULL;
}
}
-#endif
m_obj = (mmap_object *)type->tp_alloc(type, 0);
if (m_obj == NULL) {return NULL;}
m_obj->data = NULL;
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -519,17 +519,8 @@
#endif /* __APPLE__ */
}
-/* In principle, this should use HAVE__WSTAT, and _wstat
- should be detected by autoconf. However, no current
- POSIX system provides that function, so testing for
- it is pointless.
- Not sure whether the MS_WINDOWS guards are necessary:
- perhaps for cygwin/mingw builds?
-*/
-#if defined(HAVE_STAT) && !defined(MS_WINDOWS)
/* Get file status. Encode the path to the locale encoding. */
-
int
_Py_wstat(const wchar_t* path, struct stat *buf)
{
@@ -544,11 +535,8 @@
PyMem_Free(fname);
return err;
}
-#endif
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
-
#ifdef MS_WINDOWS
static __int64 secs_between_epochs = 11644473600; /* Seconds between 1.1.1601 and 1.1.1970 */
@@ -679,10 +667,8 @@
return fstat(fd, result);
#endif
}
-#endif /* HAVE_FSTAT || MS_WINDOWS */
-#ifdef HAVE_STAT
/* Call _wstat() on Windows, or encode the path to the filesystem encoding and
call stat() otherwise. Only fill st_mode attribute on Windows.
@@ -715,8 +701,6 @@
#endif
}
-#endif /* HAVE_STAT */
-
static int
get_inheritable(int fd, int raise)
diff --git a/Python/marshal.c b/Python/marshal.c
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1481,7 +1481,6 @@
return res;
}
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
/* Return size of file in bytes; < 0 if unknown or INT_MAX if too big */
static off_t
getfilesize(FILE *fp)
@@ -1496,7 +1495,6 @@
else
return (off_t)st.st_size;
}
-#endif
/* If we can get the size of the file up-front, and it's reasonably small,
* read it in one gulp and delegate to ...FromString() instead. Much quicker
@@ -1509,7 +1507,6 @@
{
/* REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. */
#define REASONABLE_FILE_LIMIT (1L << 18)
-#if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
off_t filesize;
filesize = getfilesize(fp);
if (filesize > 0 && filesize <= REASONABLE_FILE_LIMIT) {
@@ -1522,7 +1519,6 @@
}
}
-#endif
/* We don't have fstat, or we do but the file is larger than
* REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time.
*/
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list