move all datetime-related code from utils/__init__ to utils.datetime

1 files changed, 6 insertions, 5 deletions

diff --git a/src/LockFile.py b/src/LockFile.py
index 4bb07726..309e8e87 100644
--- a/src/LockFile.py
+++ b/src/LockFile.py
@@ -9,12 +9,12 @@ class LockFile(PollHook.PollHook):
         self._next_lock = None
 
     def available(self):
-        now = utils.datetime_utcnow()
+        now = utils.datetime.datetime_utcnow()
         if os.path.exists(self._filename):
             with open(self._filename, "r") as lock_file:
                 timestamp_str = lock_file.read().strip().split(" ", 1)[0]
 
-            timestamp = utils.iso8601_parse(timestamp_str)
+            timestamp = utils.datetime.iso8601_parse(timestamp_str)
 
             if (now-timestamp).total_seconds() < EXPIRATION:
                 return False
@@ -23,13 +23,14 @@ class LockFile(PollHook.PollHook):
 
     def lock(self):
         with open(self._filename, "w") as lock_file:
-            last_lock = utils.datetime_utcnow()
-            lock_file.write("%s" % utils.iso8601_format(last_lock))
+            last_lock = utils.datetime.datetime_utcnow()
+            lock_file.write("%s" % utils.datetime.iso8601_format(last_lock))
             self._next_lock = last_lock+datetime.timedelta(
                 seconds=EXPIRATION/2)
 
     def next(self):
-        return max(0, (self._next_lock-utils.datetime_utcnow()).total_seconds())
+        return max(0,
+            (self._next_lock-utils.datetime.datetime_utcnow()).total_seconds())
     def call(self):
         self.lock()