Fix Python 2.7 compatibility.

SpiNNakerManchester · Jul 18, 2016 · 8c401b3 · 8c401b3
1 parent a297897
commit 8c401b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/spalloc_server/controller.py b/spalloc_server/controller.py
@@ -14,7 +14,7 @@
 
 import time
 
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from pytz import utc
 
@@ -1228,7 +1228,7 @@ def __init__(self, id, owner,
         else:
             now = datetime.now(utc)
             epoch = datetime(1970, 1, 1, tzinfo=utc)
-            self.start_time = (now - epoch) / timedelta(seconds=1)
+            self.start_time = (now - epoch).total_seconds()
 
         # If None, never kill this job due to inactivity. Otherwise, stop the
         # job if the time exceeds this value. It is the allocator's

diff --git a/tests/test_controller.py b/tests/test_controller.py
@@ -6,7 +6,7 @@
 
 import time
 
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from pytz import utc
 
@@ -647,7 +647,7 @@ def test_list_jobs(conn, m):
 
     now = datetime.now(utc)
     epoch = datetime(1970, 1, 1, tzinfo=utc)
-    unixtime_now = (now - epoch) / timedelta(seconds=1)
+    unixtime_now = (now - epoch).total_seconds()
     assert unixtime_now - 1.0 <= jobs[0].start_time <= unixtime_now
     assert unixtime_now - 1.0 <= jobs[1].start_time <= unixtime_now