diff options
| author | Steve Dower <steve.dower@python.org> | 2020-10-19 15:50:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 15:50:36 +0100 |
| commit | c82f10450c547eb94a04ee17b7c816ff31948297 (patch) | |
| tree | ad305c05c5745e1a5e7c136545bec7eefa741e32 /Lib/datetime.py | |
| parent | eee6bb50c69d94280f43b47390ea9d1b5f42930c (diff) | |
| parent | b580ed1d9d55461d8dde027411b90be26cae131e (diff) | |
| download | cpython-git-bpo-39107.tar.gz | |
Merge branch 'master' into bpo-39107bpo-39107
Diffstat (limited to 'Lib/datetime.py')
| -rw-r--r-- | Lib/datetime.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py index 3090978508..b896b94b0f 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -1421,7 +1421,8 @@ class time: part is omitted if self.microsecond == 0. The optional argument timespec specifies the number of additional - terms of the time to include. + terms of the time to include. Valid options are 'auto', 'hours', + 'minutes', 'seconds', 'milliseconds' and 'microseconds'. """ s = _format_time(self._hour, self._minute, self._second, self._microsecond, timespec) @@ -1547,7 +1548,7 @@ class time: self._tzinfo = tzinfo def __reduce_ex__(self, protocol): - return (time, self._getstate(protocol)) + return (self.__class__, self._getstate(protocol)) def __reduce__(self): return self.__reduce_ex__(2) @@ -1906,7 +1907,8 @@ class datetime(date): time, default 'T'. The optional argument timespec specifies the number of additional - terms of the time to include. + terms of the time to include. Valid options are 'auto', 'hours', + 'minutes', 'seconds', 'milliseconds' and 'microseconds'. """ s = ("%04d-%02d-%02d%c" % (self._year, self._month, self._day, sep) + _format_time(self._hour, self._minute, self._second, |