summaryrefslogtreecommitdiffstats
path: root/Modules/clinic
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2017-01-22 05:10:12 (GMT)
committerXiang Zhang <angwerzx@126.com>2017-01-22 05:10:12 (GMT)
commit1dfaa6c38aa8607a29728db209072a5c95481bc1 (patch)
tree8c6f22fc7d579c77e61423df060ad20361d055cb /Modules/clinic
parent19dea2c726db6da2353678d8041aa2fff207b670 (diff)
parent4459e009ed36331a976d605270bc0a81d091aa75 (diff)
downloadcpython-1dfaa6c38aa8607a29728db209072a5c95481bc1.zip
cpython-1dfaa6c38aa8607a29728db209072a5c95481bc1.tar.gz
cpython-1dfaa6c38aa8607a29728db209072a5c95481bc1.tar.bz2
Issue #29092: Merge 3.6.
Diffstat (limited to 'Modules/clinic')
-rw-r--r--Modules/clinic/posixmodule.c.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index c88716f..39ac7fd 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -9,7 +9,8 @@ PyDoc_STRVAR(os_stat__doc__,
"Perform a stat system call on the given path.\n"
"\n"
" path\n"
-" Path to be examined; can be string, bytes, or open-file-descriptor int.\n"
+" Path to be examined; can be string, bytes, path-like object or\n"
+" open-file-descriptor int.\n"
" dir_fd\n"
" If not None, it should be a file descriptor open to a directory,\n"
" and path should be a relative string; path will then be relative to\n"
@@ -6492,4 +6493,4 @@ exit:
#ifndef OS_GETRANDOM_METHODDEF
#define OS_GETRANDOM_METHODDEF
#endif /* !defined(OS_GETRANDOM_METHODDEF) */
-/*[clinic end generated code: output=30cdd28fc524f2fb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=5a0be969e3f71660 input=a9049054013a1b77]*/