Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
bab76d7e
Commit
bab76d7e
authored
Nov 24, 2013
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #19545: Avoid chained exceptions while passing stray % to
time.strptime(). Initial patch by Claudiu Popa.
parent
f139fcdc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
Lib/_strptime.py
Lib/_strptime.py
+1
-1
Lib/test/test_strptime.py
Lib/test/test_strptime.py
+4
-0
Lib/test/test_time.py
Lib/test/test_time.py
+4
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/_strptime.py
View file @
bab76d7e
...
...
@@ -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:
...
...
Lib/test/test_strptime.py
View file @
bab76d7e
...
...
@@ -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
...
...
Lib/test/test_time.py
View file @
bab76d7e
...
...
@@ -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
))
...
...
Misc/NEWS
View file @
bab76d7e
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment