diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-05 15:35:45 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-05 15:35:45 -0700 |
| commit | b1cb8b287223e84b39a1a1c58aa8046a261feb38 (patch) | |
| tree | 6e5edc18d4033ae020b11d446cafea8d9bb6404c | |
| parent | 4837141def956b2079248e1ef638a1e0234e9eae (diff) | |
| parent | 768f3b4492c3ab5037cf575bd5dcf2155aeb33b5 (diff) | |
| download | cpython-git-b1cb8b287223e84b39a1a1c58aa8046a261feb38.tar.gz | |
merge 3.5
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/clinic/posixmodule.c.h | 6 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 6 |
3 files changed, 9 insertions, 6 deletions
@@ -107,6 +107,9 @@ Library - Issue #27842: The csv.DictReader now returns rows of type OrderedDict. (Contributed by Steve Holden.) +- Remove support for passing a file descriptor to os.access. It never worked but + previously didn't raise. + - Issue #12885: Fix error when distutils encounters symlink. - Issue #27881: Fixed possible bugs when setting sqlite3.Connection.isolation_level. diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index 26dedd1a73..4b44257cfb 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -100,7 +100,7 @@ PyDoc_STRVAR(os_access__doc__, "Use the real uid/gid to test for access to a path.\n" "\n" " path\n" -" Path to be tested; can be string, bytes, or open-file-descriptor int.\n" +" Path to be tested; can be string or bytes\n" " mode\n" " Operating-system mode bitfield. Can be F_OK to test existence,\n" " or the inclusive-OR of R_OK, W_OK, and X_OK.\n" @@ -137,7 +137,7 @@ os_access(PyObject *module, PyObject *args, PyObject *kwargs) PyObject *return_value = NULL; static const char * const _keywords[] = {"path", "mode", "dir_fd", "effective_ids", "follow_symlinks", NULL}; static _PyArg_Parser _parser = {"O&i|$O&pp:access", _keywords, 0}; - path_t path = PATH_T_INITIALIZE("access", "path", 0, 1); + path_t path = PATH_T_INITIALIZE("access", "path", 0, 0); int mode; int dir_fd = DEFAULT_DIR_FD; int effective_ids = 0; @@ -6042,4 +6042,4 @@ exit: #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF #define OS_SET_HANDLE_INHERITABLE_METHODDEF #endif /* !defined(OS_SET_HANDLE_INHERITABLE_METHODDEF) */ -/*[clinic end generated code: output=97180b6734421a7d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=2b85bb3703a6488a input=a9049054013a1b77]*/ diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index f9693e8d57..c9ac1f783e 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2595,8 +2595,8 @@ os_lstat_impl(PyObject *module, path_t *path, int dir_fd) /*[clinic input] os.access -> bool - path: path_t(allow_fd=True) - Path to be tested; can be string, bytes, or open-file-descriptor int. + path: path_t + Path to be tested; can be string or bytes mode: int Operating-system mode bitfield. Can be F_OK to test existence, @@ -2634,7 +2634,7 @@ Note that most operations will use the effective uid/gid, therefore this static int os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd, int effective_ids, int follow_symlinks) -/*[clinic end generated code: output=cf84158bc90b1a77 input=b75a756797af45ec]*/ +/*[clinic end generated code: output=cf84158bc90b1a77 input=8e8c3a6ba791fee3]*/ { int return_value; |