diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2004-06-03 12:47:26 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2004-06-03 12:47:26 (GMT) |
| commit | 77ca6c4c8483c22c6ba6200a94e9628671c82a3d (patch) | |
| tree | ad04aa4c13ca4097b09d95a955c4ebe8c90e6820 | |
| parent | 6b08a40442ca500c8e2073e012b51af66cab9c5a (diff) | |
| download | cpython-77ca6c4c8483c22c6ba6200a94e9628671c82a3d.zip cpython-77ca6c4c8483c22c6ba6200a94e9628671c82a3d.tar.gz cpython-77ca6c4c8483c22c6ba6200a94e9628671c82a3d.tar.bz2 | |
Warn abou missing mutate flag to ioctl. Fixes #696535.
| -rw-r--r-- | Doc/whatsnew/whatsnew24.tex | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/fcntlmodule.c | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Doc/whatsnew/whatsnew24.tex b/Doc/whatsnew/whatsnew24.tex index a394971..638eadb 100644 --- a/Doc/whatsnew/whatsnew24.tex +++ b/Doc/whatsnew/whatsnew24.tex @@ -669,6 +669,8 @@ changes to your code: system ID in the wrong order. This has been corrected; applications relying on the wrong order need to be fixed. +\item \function{fcntl.ioctl} now warns if the mutate arg is omitted. + \end{itemize} @@ -214,6 +214,8 @@ Core and builtins Extension modules ----------------- +- fcntl.ioctl now warns if the mutate flag is not specified. + - nt now properly allows to refer to UNC roots, e.g. in nt.stat(). - the weakref module now supports additional objects: array.array, diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index 9894c43..43f1773 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -108,7 +108,13 @@ fcntl_ioctl(PyObject *self, PyObject *args) char *arg; if (PyTuple_Size(args) == 3) { - /* warning goes here in 2.4 */ +#if (PY_MAJOR_VERSION>2) || (PY_MINOR_VERSION>=5) +#error Remove the warning, change mutate_arg to 1 +#endif + if (PyErr_Warn(PyExc_FutureWarning, + "ioctl with mutable buffer will mutate the buffer by default in 2.5" + ) < 0) + return NULL; mutate_arg = 0; } if (mutate_arg) { |