[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6

[victor.stinner]

https://hg.python.org/cpython/rev/6bd09ab4d6d6
changeset:   106493:6bd09ab4d6d6
parent:      106491:a60a9bc02d1d
parent:      106492:1555e7776321
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Feb 10 12:38:02 2017 +0100
summary:
  Merge 3.6

files:
  Lib/test/datetimetester.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1997,8 +1997,9 @@
             # date 0001-01-01 00:00:00+00:00: timestamp=-62135596800
             self.assertEqual(self.theclass.fromtimestamp(min_ts, tz=timezone.utc),
                              min_dt)
-        except OverflowError as exc:
-            # the date 0001-01-01 doesn't fit into 32-bit time_t
+        except (OverflowError, OSError) as exc:
+            # the date 0001-01-01 doesn't fit into 32-bit time_t,
+            # or platform doesn't support such very old date
             self.skipTest(str(exc))
 
         # maximum timestamp: set seconds to zero to avoid rounding issues

-- 
Repository URL: https://hg.python.org/cpython