mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 15:07:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Raise a ValueError when there is data that was not covered in the format string. Done to match behavior of pre-existing C-based strptime implementations.

Browse source
This commit is contained in:
Brett Cannon 2003-04-28 21:30:13 +00:00
parent a390c6e194
commit 2b6dfec1cc
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/_strptime.py
View file

@ -423,6 +423,9 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
found = format_regex.match(data_string) found = format_regex.match(data_string)
if not found: if not found:
raise ValueError("time data did not match format") raise ValueError("time data did not match format")
if len(data_string) != found.end():
raise ValueError("unconverted data remains: %s" %
data_string[found.end():])
year = 1900 year = 1900
month = day = 1 month = day = 1
hour = minute = second = 0 hour = minute = second = 0

4
Lib/test/test_strptime.py
View file

@ -227,6 +227,10 @@ class StrptimeTests(unittest.TestCase):
self.assertRaises(ValueError, _strptime.strptime, data_string="%d", self.assertRaises(ValueError, _strptime.strptime, data_string="%d",
format="%A") format="%A")
def test_unconverteddata(self):
# Check ValueError is raised when there is unconverted data
self.assertRaises(ValueError, _strptime.strptime, "10 12", "%m")
def helper(self, directive, position): def helper(self, directive, position):
"""Helper fxn in testing.""" """Helper fxn in testing."""
strf_output = time.strftime("%" + directive, self.time_tuple) strf_output = time.strftime("%" + directive, self.time_tuple)