mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Merge from 3.1
This commit is contained in:
commit
ae664fb528
2 changed files with 9 additions and 1 deletions
|
@ -3,6 +3,7 @@ import time
|
|||
import unittest
|
||||
import locale
|
||||
import sysconfig
|
||||
import sys
|
||||
import warnings
|
||||
|
||||
class TimeTestCase(unittest.TestCase):
|
||||
|
@ -39,6 +40,13 @@ class TimeTestCase(unittest.TestCase):
|
|||
except ValueError:
|
||||
self.fail('conversion specifier: %r failed.' % format)
|
||||
|
||||
# Issue #10762: Guard against invalid/non-supported format string
|
||||
# so that Python don't crash (Windows crashes when the format string
|
||||
# input to [w]strftime is not kosher.
|
||||
if sys.platform.startswith('win'):
|
||||
with self.assertRaises(ValueError):
|
||||
time.strftime('%f')
|
||||
|
||||
def _bounds_checking(self, func=time.strftime):
|
||||
# Make sure that strftime() checks the bounds of the various parts
|
||||
#of the time tuple (0 is valid for *all* values).
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue