diff -r e7ed7db521e9 Doc/library/datetime.rst --- a/Doc/library/datetime.rst Fri Dec 18 19:37:02 2015 +0200 +++ b/Doc/library/datetime.rst Mon Dec 21 23:29:47 2015 +0100 @@ -1133,7 +1133,7 @@ ``self.date().isocalendar()``. -.. method:: datetime.isoformat(sep='T') +.. method:: datetime.isoformat(sep='T', timespec='auto') Return a string representing the date and time in ISO 8601 format, YYYY-MM-DDTHH:MM:SS.mmmmmm or, if :attr:`microsecond` is 0, @@ -1154,6 +1154,34 @@ >>> datetime(2002, 12, 25, tzinfo=TZ()).isoformat(' ') '2002-12-25 00:00:00-06:39' + The optional argument *timespec* specifies the number of additional + terms of the time to include. It can be one of the following: + + - 'auto': Append microseconds except if microsecond is 0. + - 'hours': Append the hour of the day to the date. + - 'minutes': Append the hours and minutes. + - 'seconds': Append the hours, minutes and seconds. + - 'microseconds': Append the hours, minutes, seconds and microseconds. + + ValueError will be raised on invalid timespec argument. + + + >>> from datetime import datetime + >>> datetime.now().isoformat(timespec='minutes') + '2002-12-25T00:00' + >>> dt = datetime(2015, 1, 1, 12, 30, 59, 123456) + '2015-01-01T12:30:59.123' + >>> dt.isoformat(timespec='microseconds') + '2015-01-01T12:30:59.123456' + + Milliseconds, microseconds and nanoseconds are displayed only if microsecond + is not 0. + + >>> from datetime import datetime + >>> dt = datetime(2015, 1, 1, 12, 30, 59, 0) + >>> dt.isoformat(timespec='microseconds') + '2015-01-01T12:30:59' + .. method:: datetime.__str__() diff -r e7ed7db521e9 Lib/datetime.py --- a/Lib/datetime.py Fri Dec 18 19:37:02 2015 +0200 +++ b/Lib/datetime.py Mon Dec 21 23:29:47 2015 +0100 @@ -152,12 +152,25 @@ dnum = _days_before_month(y, m) + d return _time.struct_time((y, m, d, hh, mm, ss, wday, dnum, dstflag)) -def _format_time(hh, mm, ss, us): + +def _format_time(hh, mm, ss, us, timespec='auto'): # Skip trailing microseconds when us==0. - result = "%02d:%02d:%02d" % (hh, mm, ss) - if us: - result += ".%06d" % us - return result + specs = { + 'hours': '{:02d}', + 'minutes': '{:02d}:{:02d}', + 'seconds': '{:02d}:{:02d}:{:02d}', + 'microseconds': '{:02d}:{:02d}:{:02d}.{:06d}', + } + if not us: + if timespec in ('auto', 'microseconds'): + timespec = 'seconds' + elif timespec == 'auto': + timespec = 'microseconds' + + if timespec not in specs: + raise ValueError('Unknown timespec value') + return specs[timespec].format(hh, mm, ss, us) + # Correctly substitute for %z and %Z escapes in strftime formats. def _wrap_strftime(object, format, timetuple): @@ -1549,21 +1562,31 @@ self._hour, self._minute, self._second, self._year) - def isoformat(self, sep='T'): + def isoformat(self, sep='T', timespec='auto'): """Return the time formatted according to ISO. - This is 'YYYY-MM-DD HH:MM:SS.mmmmmm', or 'YYYY-MM-DD HH:MM:SS' if + This is 'YYYY-MM-DD HH:MM:SS.mmm[mmm[000]]]', or 'YYYY-MM-DD HH:MM:SS' if self.microsecond == 0. If self.tzinfo is not None, the UTC offset is also attached, giving - 'YYYY-MM-DD HH:MM:SS.mmmmmm+HH:MM' or 'YYYY-MM-DD HH:MM:SS+HH:MM'. + 'YYYY-MM-DD HH:MM:SS.mmm[mmm[000]]+HH:MM' or 'YYYY-MM-DD HH:MM:SS+HH:MM'. Optional argument sep specifies the separator between date and time, default 'T'. + + The optional argument timespec specifies the number of additional + terms of the time to include. It can be one of the following: + + 'auto': Append microseconds except if microsecond is 0. + 'hours': Append the hour of the day to the date. + 'minutes': Append the hours and minutes. + 'seconds': Append the hours, minutes and seconds. + 'microseconds': Append the hours, minutes, seconds and microseconds. """ s = ("%04d-%02d-%02d%c" % (self._year, self._month, self._day, sep) + _format_time(self._hour, self._minute, self._second, - self._microsecond)) + self._microsecond, timespec)) + off = self.utcoffset() if off is not None: if off.days < 0: diff -r e7ed7db521e9 Lib/test/datetimetester.py --- a/Lib/test/datetimetester.py Fri Dec 18 19:37:02 2015 +0200 +++ b/Lib/test/datetimetester.py Mon Dec 21 23:29:47 2015 +0100 @@ -1556,13 +1556,23 @@ self.assertEqual(dt, dt2) def test_isoformat(self): - t = self.theclass(2, 3, 2, 4, 5, 1, 123) - self.assertEqual(t.isoformat(), "0002-03-02T04:05:01.000123") - self.assertEqual(t.isoformat('T'), "0002-03-02T04:05:01.000123") - self.assertEqual(t.isoformat(' '), "0002-03-02 04:05:01.000123") - self.assertEqual(t.isoformat('\x00'), "0002-03-02\x0004:05:01.000123") + t = self.theclass(1, 2, 3, 4, 5, 1, 123) + self.assertEqual(t.isoformat(), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat('T'), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat(' '), "0001-02-03 04:05:01.000123") + self.assertEqual(t.isoformat('\x00'), "0001-02-03\x0004:05:01.000123") + self.assertEqual(t.isoformat(timespec='hours'), "0001-02-03T04") + self.assertEqual(t.isoformat(timespec='minutes'), "0001-02-03T04:05") + self.assertEqual(t.isoformat(timespec='seconds'), "0001-02-03T04:05:01") + self.assertEqual(t.isoformat(timespec='microseconds'), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat(timespec='auto'), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat(sep=' ', timespec='minutes'), "0001-02-03 04:05") + self.assertRaises(ValueError, t.isoformat, timespec='monkey') # str is ISO format with the separator forced to a blank. - self.assertEqual(str(t), "0002-03-02 04:05:01.000123") + self.assertEqual(str(t), "0001-02-03 04:05:01.000123") + + t = self.theclass(1, 2, 3, 4, 5, 1) + self.assertEqual(t.isoformat(timespec='auto'), "0001-02-03T04:05:01") t = self.theclass(2, 3, 2) self.assertEqual(t.isoformat(), "0002-03-02T00:00:00") diff -r e7ed7db521e9 Modules/_datetimemodule.c --- a/Modules/_datetimemodule.c Fri Dec 18 19:37:02 2015 +0200 +++ b/Modules/_datetimemodule.c Mon Dec 21 23:29:47 2015 +0100 @@ -4488,25 +4488,54 @@ datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) { int sep = 'T'; - static char *keywords[] = {"sep", NULL}; + char *timespec = "auto"; + static char *keywords[] = {"sep", "timespec", NULL}; char buffer[100]; - PyObject *result; + PyObject *result = NULL; int us = DATE_GET_MICROSECOND(self); - - if (!PyArg_ParseTupleAndKeywords(args, kw, "|C:isoformat", keywords, &sep)) + static char *specs[4][2] = { + {"hours", "%02d"}, + {"minutes", "%02d:%02d"}, + {"seconds", "%02d:%02d:%02d"}, + {"microseconds", "%02d:%02d:%02d.%06d"}, + }; + int sp; + static char *date_format = "%04d-%02d-%02d%c"; + char *format; + int givenspec = 0; + + if (!PyArg_ParseTupleAndKeywords(args, kw, "|Cs:isoformat", keywords, &sep, ×pec)) return NULL; - if (us) - result = PyUnicode_FromFormat("%04d-%02d-%02d%c%02d:%02d:%02d.%06d", + + if (!us){ + if ((strcmp(timespec, "auto") == 0) || strcmp(timespec, "microseconds") == 0){ + timespec = "seconds"; + } + } + else if (strcmp(timespec, "auto") == 0){ + timespec = "microseconds"; + } + + for (sp = 0; sp < 4; sp++){ + if (strcmp(timespec, specs[sp][0]) == 0) { + givenspec = 1; + format = malloc(strlen(date_format) + strlen(specs[sp][1]) + 1); + strcpy(format, date_format); + strcat(format, specs[sp][1]); + } + } + + if (!givenspec) { + PyErr_Format(PyExc_ValueError, "Unknown timespec value"); + return NULL; + } + else { + result = PyUnicode_FromFormat(format, GET_YEAR(self), GET_MONTH(self), GET_DAY(self), (int)sep, DATE_GET_HOUR(self), DATE_GET_MINUTE(self), DATE_GET_SECOND(self), us); - else - result = PyUnicode_FromFormat("%04d-%02d-%02d%c%02d:%02d:%02d", - GET_YEAR(self), GET_MONTH(self), - GET_DAY(self), (int)sep, - DATE_GET_HOUR(self), DATE_GET_MINUTE(self), - DATE_GET_SECOND(self)); + } if (!result || !HASTZINFO(self)) return result; @@ -5040,9 +5069,18 @@ {"isoformat", (PyCFunction)datetime_isoformat, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("[sep] -> string in ISO 8601 format, " - "YYYY-MM-DDTHH:MM:SS[.mmmmmm][+HH:MM].\n\n" + "YYYY-MM-DDTHH:MM:SS[.mmm[mmm[000]]][+HH:MM].\n\n" "sep is used to separate the year from the time, and " - "defaults to 'T'.")}, + "defaults to 'T'.\n\n" + "The optional argument timespec specifies the number of " + "additional terms of the time to include. It can be one " + "of the following:\n" + "auto: Append microseconds except if microsecond is 0.\n" + "hours: Append the hour of the day to the date.\n" + "minutes: Append the hours and minutes.\n" + "seconds: Append the hours, minutes and seconds.\n" + "microseconds: Append the hours, minutes, seconds and microseconds " + "except if microsecond is 0.\n\n")}, {"utcoffset", (PyCFunction)datetime_utcoffset, METH_NOARGS, PyDoc_STR("Return self.tzinfo.utcoffset(self).")},