mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
bpo-34454: Clean up datetime.fromisoformat surrogate handling (GH-8959)
* Use _PyUnicode_Copy in sanitize_isoformat_str * Use repr in fromisoformat error message This reverses commit 67b74a98b2 per Serhiy Storchaka's suggestion: I suggested to use %R in the error message because including the raw string can be confusing in the case of empty string, or string containing trailing whitespaces, invisible or unprintable characters. We agree that it is better to change both the C and pure Python versions to use repr. * Retain non-sanitized dtstr for error printing This does not create an extra string, it just holds on to a reference to the original input string for purposes of creating the error message. * PEP 7 fixes to from_isoformat * Separate handling of Unicode and other errors In the initial implementation, errors other than encoding errors would both raise an error indicating an invalid format, which would not be true for errors like MemoryError. * Drop needs_decref from _sanitize_isoformat_str Instead _sanitize_isoformat_str returns a new reference, even to the original string.
This commit is contained in:
parent
5a95ba29da
commit
3df85404d4
3 changed files with 106 additions and 76 deletions
|
@ -13,6 +13,7 @@ import sys
|
|||
import os
|
||||
import pickle
|
||||
import random
|
||||
import re
|
||||
import struct
|
||||
import unittest
|
||||
|
||||
|
@ -2676,6 +2677,14 @@ class TestDateTime(TestDate):
|
|||
with self.assertRaises(ValueError):
|
||||
self.theclass.fromisoformat(bad_str)
|
||||
|
||||
def test_fromisoformat_fails_surrogate(self):
|
||||
# Test that when fromisoformat() fails with a surrogate character as
|
||||
# the separator, the error message contains the original string
|
||||
dtstr = "2018-01-03\ud80001:0113"
|
||||
|
||||
with self.assertRaisesRegex(ValueError, re.escape(repr(dtstr))):
|
||||
self.theclass.fromisoformat(dtstr)
|
||||
|
||||
def test_fromisoformat_utc(self):
|
||||
dt_str = '2014-04-19T13:21:13+00:00'
|
||||
dt = self.theclass.fromisoformat(dt_str)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue