summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-02-10 11:38:02 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2017-02-10 11:38:02 (GMT)
commit109a9fe7960c5bac931aa817e57da7556d64e4a6 (patch)
treece1368518c19fec7fbb18610f3172cb426d734ce
parent07547cdad30c53a488226b5f7d7271b9ddff16c5 (diff)
parent2a35c939cc92b2f4ff41080497ce27e35dc5b858 (diff)
downloadcpython-109a9fe7960c5bac931aa817e57da7556d64e4a6.zip
cpython-109a9fe7960c5bac931aa817e57da7556d64e4a6.tar.gz
cpython-109a9fe7960c5bac931aa817e57da7556d64e4a6.tar.bz2
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 42944a2..2350125 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