diff options
| author | Martin Panter <vadmium> | 2015-09-09 03:01:17 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-09-09 03:01:17 (GMT) |
| commit | a122b5a1fdecb8b131e1773a30e94021f32a90bc (patch) | |
| tree | 69211f5815d460bc991ee6df2cb8f0aa8fbc1c3f /Modules/clinic/posixmodule.c.h | |
| parent | 9b82a99a64d3ef9ffd407e69be92a14ad482a925 (diff) | |
| parent | 5127cdea054eba8d1f7631f050f3a91cc01b6542 (diff) | |
| download | cpython-a122b5a1fdecb8b131e1773a30e94021f32a90bc.zip cpython-a122b5a1fdecb8b131e1773a30e94021f32a90bc.tar.gz cpython-a122b5a1fdecb8b131e1773a30e94021f32a90bc.tar.bz2 | |
Issue #23738: Merge 3.5 into 3.6
Diffstat (limited to 'Modules/clinic/posixmodule.c.h')
| -rw-r--r-- | Modules/clinic/posixmodule.c.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index a7045a8..a48de6a 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -1487,10 +1487,10 @@ PyDoc_STRVAR(os_utime__doc__, "\n" "If times is not None, it must be a tuple (atime, mtime);\n" " atime and mtime should be expressed as float seconds since the epoch.\n" -"If ns is not None, it must be a tuple (atime_ns, mtime_ns);\n" +"If ns is specified, it must be a tuple (atime_ns, mtime_ns);\n" " atime_ns and mtime_ns should be expressed as integer nanoseconds\n" " since the epoch.\n" -"If both times and ns are None, utime uses the current time.\n" +"If times is None and ns is unspecified, utime uses the current time.\n" "Specifying tuples for both times and ns is an error.\n" "\n" "If dir_fd is not None, it should be a file descriptor open to a directory,\n" @@ -5792,4 +5792,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=35b50461dbecd65d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a5c9bef9ad11a20b input=a9049054013a1b77]*/ |