Changeset 31819c5 in sasmodels for sasmodels/bumps_model.py

Timestamp:

Oct 31, 2014 5:17:43 PM (9 years ago)

Author:

pkienzle

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

216a9e1

Parents:

ba69383

Message:

python2.6 does not support timedelta.total_seconds()

File:

• sasmodels/bumps_model.py (modified) (2 diffs)

sasmodels/bumps_model.py

@@ -4 +4 @@
 import sys, os
 import datetime
+
+# CRUFT python 2.6
+if not hasattr(datetime.timedelta, 'total_seconds'):
+    def delay(dt): return dt.days*86400 + dt.seconds + 1e-6*dt.microseconds
+else:
+    def delay(dt): return dt.total_seconds()
 
 import numpy as np
@@ -33 +39 @@
     """
     then = datetime.datetime.now()
-    return lambda: (datetime.datetime.now()-then).total_seconds()
+    return lambda: delay(datetime.datetime.now()-then)