diff options
author | Andrew M. Kuchling <amk@amk.ca> | 2010-08-18 22:30:34 (GMT) |
---|---|---|
committer | Andrew M. Kuchling <amk@amk.ca> | 2010-08-18 22:30:34 (GMT) |
commit | 4ea04a306f6f43c9dc2f9c196b658abf021a8362 (patch) | |
tree | 92fceb1199e346339dca396ed312292d42cf07f8 | |
parent | 0fc86b86ed1381866f159f534125449d069c1785 (diff) | |
download | cpython-4ea04a306f6f43c9dc2f9c196b658abf021a8362.zip cpython-4ea04a306f6f43c9dc2f9c196b658abf021a8362.tar.gz cpython-4ea04a306f6f43c9dc2f9c196b658abf021a8362.tar.bz2 |
#7647: add ST_RDONLY, ST_NOSUID constants to os module.
(Also fix a name ordering in the ACKS file.)
-rw-r--r-- | Doc/library/os.rst | 8 | ||||
-rw-r--r-- | Doc/whatsnew/3.2.rst | 4 | ||||
-rw-r--r-- | Misc/ACKS | 3 | ||||
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Modules/posixmodule.c | 8 |
5 files changed, 25 insertions, 1 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 3a7b599..9ab5fb1 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1342,6 +1342,14 @@ Files and Directories :attr:`f_bavail`, :attr:`f_files`, :attr:`f_ffree`, :attr:`f_favail`, :attr:`f_flag`, :attr:`f_namemax`. + Two module-level constants are defined for the :attr:`f_flag` attribute's + bit-flags: if :const:`ST_RDONLY` is set, the filesystem is mounted + read-only, and if :const:`ST_NOSUID` is set, the semantics of + setuid/setgid bits are disabled or not supported. + + .. versionchanged:: 3.2 + The :const:`ST_RDONLY` and :const:`ST_NOSUID` constants were added. + Availability: Unix. diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst index 1799b70..81cfa83 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -111,6 +111,10 @@ New, Improved, and Deprecated Modules programmer aware that his code contains object finalization issues. (Added by Antoine Pitrou; :issue:`477863`.) +* The :mod:`os` module now has the :const:`ST_RDONLY` and :const:`ST_NOSUID` + constants, for use with the :func:`~os.statvfs` function. + (Patch by Adam Jackson; :issue:`7647`.) + * The :func:`shutil.copytree` function has two new options: * *ignore_dangling_symlinks*: when ``symlinks=False`` (meaning that the @@ -389,8 +389,9 @@ Tony Ingraldi John Interrante Bob Ippolito Atsuo Ishimoto -Paul Jackson +Adam Jackson Ben Jackson +Paul Jackson David Jacobs Kevin Jacobs Kjetil Jacobsen @@ -152,6 +152,9 @@ Library using the filesystem encoding and surrogateescape error handler. Patch written by David Watson. +- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID + constants, for use with the statvfs() function. Patch by Adam Jackson. + - Issue #8688: MANIFEST files created by distutils now include a magic comment indicating they are generated. Manually maintained MANIFESTs without this marker will not be overwritten or removed. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index c36f7b4..ce625b4 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -8169,6 +8169,14 @@ all_ins(PyObject *d) if (ins(d, "EX_NOTFOUND", (long)EX_NOTFOUND)) return -1; #endif /* EX_NOTFOUND */ + /* statvfs */ +#ifdef ST_RDONLY + if (ins(d, "ST_RDONLY", (long)ST_RDONLY)) return -1; +#endif /* ST_RDONLY */ +#ifdef ST_NOSUID + if (ins(d, "ST_NOSUID", (long)ST_NOSUID)) return -1; +#endif /* ST_NOSUID */ + #ifdef HAVE_SPAWNV #if defined(PYOS_OS2) && defined(PYCC_GCC) if (ins(d, "P_WAIT", (long)P_WAIT)) return -1; |