Merge 3.6

manasvita · Feb 10, 2017 · 109a9fe · 109a9fe
2 parents 07547cd + 2a35c93
commit 109a9fe
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
@@ -1997,8 +1997,9 @@ def test_timestamp_limits(self):
             # 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