summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong-hee Na <donghee.na92@gmail.com>2019-10-28 07:31:15 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2019-10-28 07:31:15 (GMT)
commit3bfc8e0fcc707d200c267ff05b052fd6a63c985a (patch)
treeadc7e753effdeba3575aab6ffad8adc43e5dcde0
parent85c6f8c65cd4f7219522c1f304bdfff19f785e7a (diff)
downloadcpython-3bfc8e0fcc707d200c267ff05b052fd6a63c985a.zip
cpython-3bfc8e0fcc707d200c267ff05b052fd6a63c985a.tar.gz
cpython-3bfc8e0fcc707d200c267ff05b052fd6a63c985a.tar.bz2
bpo-38602: Add fcntl.F_OFD_XXXX for fcntlmodule (GH-16956)
-rw-r--r--Doc/library/fcntl.rst2
-rw-r--r--Doc/whatsnew/3.9.rst9
-rw-r--r--Misc/NEWS.d/next/Library/2019-10-27-22-29-45.bpo-38602.7jvYFA.rst3
-rw-r--r--Modules/fcntlmodule.c9
4 files changed, 22 insertions, 1 deletions
diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst
index da39c31..5c172b8 100644
--- a/Doc/library/fcntl.rst
+++ b/Doc/library/fcntl.rst
@@ -36,6 +36,8 @@ descriptor.
.. versionchanged:: 3.9
On macOS, the fcntl module exposes the ``F_GETPATH`` constant, which obtains
the path of a file from a file descriptor.
+ On Linux(>=3.15), the fcntl module exposes the ``F_OFD_GETLK``, ``F_OFD_SETLK``
+ and ``F_OFD_SETLKW`` constants, which working with open file description locks.
The module defines the following functions:
diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
index b95b099..886c555 100644
--- a/Doc/whatsnew/3.9.rst
+++ b/Doc/whatsnew/3.9.rst
@@ -125,8 +125,15 @@ that schedules a shutdown for the default executor that waits on the
:func:`asyncio.run` has been updated to use the new :term:`coroutine`.
(Contributed by Kyle Stanley in :issue:`34037`.)
+fcntl
+-----
+
+Added constants :data:`~fcntl.F_OFD_GETLK`, :data:`~fcntl.F_OFD_SETLK`
+and :data:`~fcntl.F_OFD_SETLKW`.
+(Contributed by Dong-hee Na in :issue:`38602`.)
+
os
-__
+--
Added :data:`~os.CLD_KILLED` and :data:`~os.CLD_STOPPED` for :attr:`si_code`.
(Contributed by Dong-hee Na in :issue:`38493`.)
diff --git a/Misc/NEWS.d/next/Library/2019-10-27-22-29-45.bpo-38602.7jvYFA.rst b/Misc/NEWS.d/next/Library/2019-10-27-22-29-45.bpo-38602.7jvYFA.rst
new file mode 100644
index 0000000..9b8229b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-10-27-22-29-45.bpo-38602.7jvYFA.rst
@@ -0,0 +1,3 @@
+Added constants :data:`~fcntl.F_OFD_GETLK`, :data:`~fcntl.F_OFD_SETLK`
+and :data:`~fcntl.F_OFD_SETLKW` to the :mod:`fcntl` module.
+Patch by Dong-hee Na.
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index cfa1225..1e5b0f7 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -495,6 +495,15 @@ all_ins(PyObject* m)
#ifdef F_SETLKW
if (PyModule_AddIntMacro(m, F_SETLKW)) return -1;
#endif
+#ifdef F_OFD_GETLK
+ if (PyModule_AddIntMacro(m, F_OFD_GETLK)) return -1;
+#endif
+#ifdef F_OFD_SETLK
+ if (PyModule_AddIntMacro(m, F_OFD_SETLK)) return -1;
+#endif
+#ifdef F_OFD_SETLKW
+ if (PyModule_AddIntMacro(m, F_OFD_SETLKW)) return -1;
+#endif
#ifdef F_GETOWN
if (PyModule_AddIntMacro(m, F_GETOWN)) return -1;
#endif