traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-41867: List options for timespec in docstrings of isoformat methods (GH-22418)

This commit is contained in:
Ram Rachum 2020-10-03 13:43:47 +03:00 committed by GitHub
parent f97e42ef4d
commit 52301312bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/datetime.py
View File

@ -1421,7 +1421,8 @@ class time:
part is omitted if self.microsecond == 0. part is omitted if self.microsecond == 0.
The optional argument timespec specifies the number of additional 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, s = _format_time(self._hour, self._minute, self._second,
self._microsecond, timespec) self._microsecond, timespec)
@ -1906,7 +1907,8 @@ class datetime(date):
time, default 'T'. time, default 'T'.
The optional argument timespec specifies the number of additional 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) + s = ("%04d-%02d-%02d%c" % (self._year, self._month, self._day, sep) +
_format_time(self._hour, self._minute, self._second, _format_time(self._hour, self._minute, self._second,

12
Modules/_datetimemodule.c
View File

@ -4663,7 +4663,10 @@ static PyMethodDef time_methods[] = {
{"isoformat", (PyCFunction)(void(*)(void))time_isoformat, METH_VARARGS | METH_KEYWORDS, {"isoformat", (PyCFunction)(void(*)(void))time_isoformat, METH_VARARGS | METH_KEYWORDS,
PyDoc_STR("Return string in ISO 8601 format, [HH[:MM[:SS[.mmm[uuu]]]]]" PyDoc_STR("Return string in ISO 8601 format, [HH[:MM[:SS[.mmm[uuu]]]]]"
"[+HH:MM].\n\n" "[+HH:MM].\n\n"
"timespec specifies what components of the time to include.\n")}, "The optional argument timespec specifies the number "
"of additional terms\nof the time to include. Valid "
"options are 'auto', 'hours', 'minutes',\n'seconds', "
"'milliseconds' and 'microseconds'.\n")},
{"strftime", (PyCFunction)(void(*)(void))time_strftime, METH_VARARGS | METH_KEYWORDS, {"strftime", (PyCFunction)(void(*)(void))time_strftime, METH_VARARGS | METH_KEYWORDS,
PyDoc_STR("format -> strftime() style string.")}, PyDoc_STR("format -> strftime() style string.")},
@ -6370,9 +6373,10 @@ static PyMethodDef datetime_methods[] = {
"YYYY-MM-DDT[HH[:MM[:SS[.mmm[uuu]]]]][+HH:MM].\n" "YYYY-MM-DDT[HH[:MM[:SS[.mmm[uuu]]]]][+HH:MM].\n"
"sep is used to separate the year from the time, and " "sep is used to separate the year from the time, and "
"defaults to 'T'.\n" "defaults to 'T'.\n"
"timespec specifies what components of the time to include" "The optional argument timespec specifies the number "
" (allowed values are 'auto', 'hours', 'minutes', 'seconds'," "of additional terms\nof the time to include. Valid "
" 'milliseconds', and 'microseconds').\n")}, "options are 'auto', 'hours', 'minutes',\n'seconds', "
"'milliseconds' and 'microseconds'.\n")},
{"utcoffset", (PyCFunction)datetime_utcoffset, METH_NOARGS, {"utcoffset", (PyCFunction)datetime_utcoffset, METH_NOARGS,
PyDoc_STR("Return self.tzinfo.utcoffset(self).")}, PyDoc_STR("Return self.tzinfo.utcoffset(self).")},