diff options
| author | Martin Panter <vadmium> | 2015-09-09 01:56:53 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-09-09 01:56:53 (GMT) |
| commit | 0ff89099c7f1c848c0df3f7f2220b26e08b939da (patch) | |
| tree | e207a8fe6251a50e6f1b3bb8fee21b916a8a49cb /Modules/clinic | |
| parent | dfcfe133001d8d6a8af05f1ce45d7c14ffd1a588 (diff) | |
| parent | bf19d169504823c258a9aae4bf61c8df9ff5987f (diff) | |
| download | cpython-0ff89099c7f1c848c0df3f7f2220b26e08b939da.zip cpython-0ff89099c7f1c848c0df3f7f2220b26e08b939da.tar.gz cpython-0ff89099c7f1c848c0df3f7f2220b26e08b939da.tar.bz2 | |
Issue #23738: Merge 3.4 into 3.5
Diffstat (limited to 'Modules/clinic')
| -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 98eeae4..9ef702a 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" @@ -5788,4 +5788,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=f3f92b2d2e2c3fe3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=95824c52fd034654 input=a9049054013a1b77]*/ |