Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
b1cb8b28
Commit
b1cb8b28
authored
Sep 05, 2016
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Plain Diff
merge 3.5
parents
4837141d
768f3b44
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
Misc/NEWS
Misc/NEWS
+3
-0
Modules/clinic/posixmodule.c.h
Modules/clinic/posixmodule.c.h
+3
-3
Modules/posixmodule.c
Modules/posixmodule.c
+3
-3
No files found.
Misc/NEWS
View file @
b1cb8b28
...
...
@@ -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
.
...
...
Modules/clinic/posixmodule.c.h
View file @
b1cb8b28
...
...
@@ -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]*/
Modules/posixmodule.c
View file @
b1cb8b28
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment