From: Xiang Zhang <angwerzx@126.com>
Date: Sun, 22 Jan 2017 05:04:17 +0000 (+0800)
Subject: Issue #29092: Sync os.stat's doc and docstring on path type.
X-Git-Tag: v3.6.1rc1~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4459e009ed36331a976d605270bc0a81d091aa75;p=thirdparty%2FPython%2Fcpython.git

Issue #29092: Sync os.stat's doc and docstring on path type.
---

4459e009ed36331a976d605270bc0a81d091aa75
diff --cc Doc/library/os.rst
index 988cb7ca3345,3aee501cabde..37fa2a2868da
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@@ -2213,8 -2068,7 +2213,8 @@@ features
  
     Get the status of a file or a file descriptor. Perform the equivalent of a
     :c:func:`stat` system call on the given path. *path* may be specified as
-    either a string -- directly or indirectly through the :class:`PathLike`
 -   either a string, a bytes or as an open file descriptor. Return a :class:`stat_result`
++   either a string or bytes -- directly or indirectly through the :class:`PathLike`
 +   interface -- or as an open file descriptor. Return a :class:`stat_result`
     object.
  
     This function normally follows symlinks; to stat a symlink add the argument
diff --cc Modules/clinic/posixmodule.c.h
index f63a3beabf9e,b3521d81c6aa..0d3ce6eed65d
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@@ -9,7 -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"
@@@ -6145,8 -5785,4 +6146,8 @@@ 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=7690b72549d2524e input=a9049054013a1b77]*/
 +
 +#ifndef OS_GETRANDOM_METHODDEF
 +    #define OS_GETRANDOM_METHODDEF
 +#endif /* !defined(OS_GETRANDOM_METHODDEF) */
- /*[clinic end generated code: output=50cfb7ebc44efb67 input=a9049054013a1b77]*/
++/*[clinic end generated code: output=455def991740915a input=a9049054013a1b77]*/
diff --cc Modules/posixmodule.c
index 33ee70d8d54e,3e446a524e9e..dc3fb94c8714
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@@ -2386,7 -2461,7 +2386,8 @@@ class sched_param_converter(CConverter)
  os.stat
  
      path : path_t(allow_fd=True)
--        Path to be examined; can be string, bytes, or open-file-descriptor int.
++        Path to be examined; can be string, bytes, path-like object or
++        open-file-descriptor int.
  
      *
  
@@@ -2413,7 -2488,7 +2414,7 @@@ It's an error to use dir_fd or follow_s
  
  static PyObject *
  os_stat_impl(PyObject *module, path_t *path, int dir_fd, int follow_symlinks)
--/*[clinic end generated code: output=7d4976e6f18a59c5 input=099d356c306fa24a]*/
++/*[clinic end generated code: output=7d4976e6f18a59c5 input=270bd64e7bb3c8f7]*/
  {
      return posix_do_stat("stat", path, dir_fd, follow_symlinks);
  }