Unify error handling for overflow values across Python 2 and 3 in saf…

…eXtime

src/zope/datetime/__init__.py

@@ -470,20 +470,20 @@ def _correctYear(year):
 def safegmtime(t):
     '''gmtime with a safety zone.'''
     try:
-        t_int = int(t)
-    except OverflowError:
-        raise TimeError('The time %f is beyond the range '
-                        'of this Python implementation.' % float(t))
-    return _time.gmtime(t_int)
+        return _time.gmtime(t)
+    except (ValueError, OverflowError): # Py2/Py3 respectively
+        raise TimeError('The time %r is beyond the range '
+                        'of this Python implementation.' % t)
+
 
 def safelocaltime(t):
     '''localtime with a safety zone.'''
     try:
-        t_int = int(t)
-    except OverflowError:
-        raise TimeError('The time %f is beyond the range '
-                        'of this Python implementation.' % float(t))
-    return _time.localtime(t_int)
+        return _time.localtime(t)
+    except (ValueError, OverflowError): # Py2/Py3 respectively
+        raise TimeError('The time %r is beyond the range '
+                        'of this Python implementation.' % t)
+
 
 class DateTimeParser(object):
 

src/zope/datetime/tests/test_datetime.py

@@ -33,18 +33,14 @@ def test_correctYear(self):
 
 
     def test_safegmtime_safelocaltime_overflow(self):
-        def i(*args):
-            raise OverflowError()
-        try:
-            datetime.int = i
-            with self.assertRaises(datetime.TimeError):
-                datetime.safegmtime(1)
-
-            with self.assertRaises(datetime.TimeError):
-                datetime.safelocaltime(1)
-
-        finally:
-            del datetime.int
+        # Use values that are practically guaranteed to overflow on all
+        # platforms
+        v = 2**64 + 1
+        fv = float(v)
+        for func in (datetime.safegmtime, datetime.safelocaltime):
+            for x in (v, fv):
+                with self.assertRaises(datetime.TimeError):
+                    func(x)
 
     def test_safegmtime(self):
         self.assertIsNotNone(datetime.safegmtime(6000))