Merge from 3.1

diff --cc Lib/test/test_time.py
index 2b58093f92909421a610223c78f9b6fe932536fe,65b273557f3995f0fdf40c23b9f1584eb25a0313..8499af81577107554a4b100ecbe20ecf8fa871dc
--- 1/Lib/test/test_time.py
--- 2/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@@ -2,8 -2,7 +2,9 @@@ from test import suppor
  import time
  import unittest
  import locale
 +import sysconfig
+ import sys
 +import warnings
  
  class TimeTestCase(unittest.TestCase):
  
@@@ -39,7 -38,14 +40,14 @@@
              except ValueError:
                  self.fail('conversion specifier: %r failed.' % format)
  
 -    def test_strftime_bounds_checking(self):
+         # 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).
  

diff --cc Modules/timemodule.c
Simple merge