diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 39a7a1530a95cc..0bfddde21ece1d 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -2570,8 +2570,10 @@ requires, and these work on all supported platforms. | ``%M`` | Minute as a zero-padded | 00, 01, ..., 59 | \(9) | | | decimal number. | | | +-----------+--------------------------------+------------------------+-------+ -| ``%n`` | The newline character | ``\n`` | \(0) | -| | (``'\n'``). | | | +| ``%n`` | The newline character | ``\n`` | | +| | (``'\n'``). For | | | +| | :meth:`!strptime`, arbitrary | | | +| | whitespace. | | | +-----------+--------------------------------+------------------------+-------+ | ``%p`` | Locale's equivalent of either || AM, PM (en_US); | \(1), | | | AM or PM. || am, pm (de_DE) | \(3) | @@ -2584,8 +2586,9 @@ requires, and these work on all supported platforms. | ``%S`` | Second as a zero-padded | 00, 01, ..., 59 | \(4), | | | decimal number. | | \(9) | +-----------+--------------------------------+------------------------+-------+ -| ``%t`` | The tab character | ``\t`` | \(0) | -| | (``'\t'``). | | | +| ``%t`` | The tab character (``'\t'``). | ``\t`` | | +| | For :meth:`!strptime`, | | | +| | arbitrary whitespace. | | | +-----------+--------------------------------+------------------------+-------+ | ``%T`` | ISO 8601 time format, | 10:01:59 | | | | equivalent to ``%H:%M:%S``. | | | @@ -2676,7 +2679,8 @@ differences between platforms in handling of unsupported format specifiers. ``%:z`` was added for :meth:`~.datetime.strftime`. .. versionadded:: 3.15 - ``%:z``, ``%F``, and ``%D`` were added for :meth:`~.datetime.strptime`. + ``%D``, ``%F``, ``%n``, ``%t``, and ``%:z`` were added for + :meth:`~.datetime.strptime`. Technical Detail ^^^^^^^^^^^^^^^^ diff --git a/Lib/_strptime.py b/Lib/_strptime.py index fe34808d88769a..27c6ef849d26e6 100644 --- a/Lib/_strptime.py +++ b/Lib/_strptime.py @@ -382,7 +382,10 @@ def __init__(self, locale_time=None): 'Z': self.__seqToRE((tz for tz_names in self.locale_time.timezone for tz in tz_names), 'Z'), - '%': '%'} + 'n': r'\s*', + 't': r'\s*', + '%': '%' + } if self.locale_time.LC_alt_digits is None: for d in 'dmyCHIMS': mapping['O' + d] = r'(?P<%s>\d\d|\d| \d)' % d diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 97eec618932aa5..9b38aab75f7908 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -2207,6 +2207,32 @@ def test_strptime_D_format(self): self.theclass.strptime(test_date, "%m/%d/%y") ) + def test_strptime_t_format(self): + test_year,test_month,test_day = 2026,2,20 + whitespaces = ('',' ','\t','\r','\v','\n','\f') + for ws in (*whitespaces,''.join(whitespaces)): + with self.subTest(whitespace=ws): + self.assertEqual( + self.theclass.strptime( + f'{test_year:04d}{ws}{test_month:02d}{ws}{test_day:02d}', + "%Y%t%m%t%d" + ), + self.theclass(test_year,test_month,test_day) + ) + + def test_strptime_n_format(self): + test_year,test_month,test_day = 2026,2,25 + whitespaces = ('',' ','\t','\r','\v','\n','\f') + for ws in (*whitespaces,''.join(whitespaces)): + with self.subTest(whitespace=ws): + self.assertEqual( + self.theclass.strptime( + f'{test_year:04d}{ws}{test_month:02d}{ws}{test_day:02d}', + "%Y%n%m%n%d" + ), + self.theclass(test_year,test_month,test_day) + ) + ############################################################################# # datetime tests diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index fd8525feb88d53..10efbd0bbcec3c 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -670,6 +670,38 @@ def test_strptime_D_format(self): time.strptime(test_date, "%m/%d/%y") ) + def test_strptime_t_format(self): + test_year,test_month,test_day = 2026,2,20 + whitespaces = ('',' ','\t','\r','\v','\n','\f') + for ws in (*whitespaces,''.join(whitespaces)): + with self.subTest(whitespace=ws): + self.assertEqual( + time.strptime( + f'{test_year:04d}{ws}{test_month:02d}{ws}{test_day:02d}', + "%Y%t%m%t%d" + ), + time.strptime( + f'{test_year:04d}-{test_month:02d}-{test_day:02d}', + "%Y-%m-%d" + ) + ) + + def test_strptime_n_format(self): + test_year,test_month,test_day = 2026,2,20 + whitespaces = ('',' ','\t','\r','\v','\n','\f') + for ws in (*whitespaces,''.join(whitespaces)): + with self.subTest(whitespace=ws): + self.assertEqual( + time.strptime( + f'{test_year:04d}{ws}{test_month:02d}{ws}{test_day:02d}', + "%Y%n%m%n%d" + ), + time.strptime( + f'{test_year:04d}-{test_month:02d}-{test_day:02d}', + "%Y-%m-%d" + ) + ) + class Strptime12AMPMTests(unittest.TestCase): """Test a _strptime regression in '%I %p' at 12 noon (12 PM)""" diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index da5fd16b8b6291..be8f6b057654c2 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -359,7 +359,7 @@ def test_strptime(self): # raising an exception. tt = time.gmtime(self.t) for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'D', 'F', 'H', 'I', - 'j', 'm', 'M', 'p', 'S', 'T', + 'j', 'm', 'M', 'n', 'p', 'S', 't', 'T', 'U', 'w', 'W', 'x', 'X', 'y', 'Y', 'Z', '%'): format = '%' + directive if directive == 'd': diff --git a/Misc/NEWS.d/next/Library/2026-02-17-03-43-07.gh-issue-140715.twmcM_.rst b/Misc/NEWS.d/next/Library/2026-02-17-03-43-07.gh-issue-140715.twmcM_.rst new file mode 100644 index 00000000000000..dbdb42cb468083 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-02-17-03-43-07.gh-issue-140715.twmcM_.rst @@ -0,0 +1 @@ +Add ``'%n'`` and ``'%t'`` support to :meth:`~datetime.datetime.strptime`.