summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-02-10 12:38:02 +0100
committerVictor Stinner <victor.stinner@gmail.com>2017-02-10 12:38:02 +0100
commitd4f3f7cf3514466c9d3c4b1b66825f1ec159f1f8 (patch)
tree1c6ce12497bf9bd8b32ee6a4af26ddafdc40da61
parent5df8c78027274de63ba88da99daf4ed48f041171 (diff)
parent40cb547717071319838f6064cf351a048e1ab970 (diff)
downloadcpython-d4f3f7cf3514466c9d3c4b1b66825f1ec159f1f8.tar.gz
Merge 3.6
-rw-r--r--Lib/test/datetimetester.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 42944a2d06..2350125f6d 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1997,8 +1997,9 @@ class TestDateTime(TestDate):
# 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