Browse Source

Issue #19545: Avoid chained exceptions while passing stray % to

time.strptime().  Initial patch by Claudiu Popa.
pull/2332/head
Serhiy Storchaka 13 years ago
parent
commit
cdac302af3
  1. 2
      Lib/_strptime.py
  2. 4
      Lib/test/test_strptime.py
  3. 4
      Lib/test/test_time.py
  4. 3
      Misc/NEWS

2
Lib/_strptime.py

@ -329,7 +329,7 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
(bad_directive, format)) from None
# IndexError only occurs when the format string is "%"
except IndexError:
raise ValueError("stray %% in format '%s'" % format)
raise ValueError("stray %% in format '%s'" % format) from None
_regex_cache[format] = format_regex
found = format_regex.match(data_string)
if not found:

4
Lib/test/test_strptime.py

@ -223,6 +223,10 @@ class StrptimeTests(unittest.TestCase):
with self.assertRaises(ValueError) as e:
_strptime._strptime_time('', '%D')
self.assertIs(e.exception.__suppress_context__, True)
# additional check for IndexError branch (issue #19545)
with self.assertRaises(ValueError) as e:
_strptime._strptime_time('19', '%Y %')
self.assertIs(e.exception.__suppress_context__, True)
def test_unconverteddata(self):
# Check ValueError is raised when there is unconverted data

4
Lib/test/test_time.py

@ -198,6 +198,10 @@ class TimeTestCase(unittest.TestCase):
with self.assertRaises(ValueError) as e:
time.strptime('', '%D')
self.assertIs(e.exception.__suppress_context__, True)
# additional check for IndexError branch (issue #19545)
with self.assertRaises(ValueError) as e:
time.strptime('19', '%Y %')
self.assertIs(e.exception.__suppress_context__, True)
def test_asctime(self):
time.asctime(time.gmtime(self.t))

3
Misc/NEWS

@ -13,6 +13,9 @@ Core and Builtins
Library
-------
- Issue #19545: Avoid chained exceptions while passing stray % to
time.strptime(). Initial patch by Claudiu Popa.
- Issue #19633: Fixed writing not compressed 16- and 32-bit wave files on
big-endian platforms.

Loading…
Cancel
Save