mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 17:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.5

Browse source
This commit is contained in:
Benjamin Peterson 2016-09-05 15:35:45 -07:00
commit b1cb8b2872
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -107,6 +107,9 @@ Library
- Issue #27842: The csv.DictReader now returns rows of type OrderedDict. - Issue #27842: The csv.DictReader now returns rows of type OrderedDict.
(Contributed by Steve Holden.) (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 #12885: Fix error when distutils encounters symlink.
- Issue #27881: Fixed possible bugs when setting sqlite3.Connection.isolation_level. - Issue #27881: Fixed possible bugs when setting sqlite3.Connection.isolation_level.

6
Modules/clinic/posixmodule.c.h
View file

@ -100,7 +100,7 @@ PyDoc_STRVAR(os_access__doc__,
"Use the real uid/gid to test for access to a path.\n" "Use the real uid/gid to test for access to a path.\n"
"\n" "\n"
" path\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" " mode\n"
" Operating-system mode bitfield. Can be F_OK to test existence,\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" " 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; PyObject *return_value = NULL;
static const char * const _keywords[] = {"path", "mode", "dir_fd", "effective_ids", "follow_symlinks", 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}; 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 mode;
int dir_fd = DEFAULT_DIR_FD; int dir_fd = DEFAULT_DIR_FD;
int effective_ids = 0; int effective_ids = 0;
@ -6042,4 +6042,4 @@ exit:
#ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF
#define OS_SET_HANDLE_INHERITABLE_METHODDEF #define OS_SET_HANDLE_INHERITABLE_METHODDEF
#endif /* !defined(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]*/

6
Modules/posixmodule.c
View file

@ -2595,8 +2595,8 @@ os_lstat_impl(PyObject *module, path_t *path, int dir_fd)
/*[clinic input] /*[clinic input]
os.access -> bool os.access -> bool
path: path_t(allow_fd=True) path: path_t
Path to be tested; can be string, bytes, or open-file-descriptor int. Path to be tested; can be string or bytes
mode: int mode: int
Operating-system mode bitfield. Can be F_OK to test existence, 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 static int
os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd, os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd,
int effective_ids, int follow_symlinks) 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; int return_value;