From 42cb26f273f3a57a9d614ff1fa6096f6bf6f5a30 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Wed, 29 May 2013 19:58:11 +0200 Subject: [PATCH] Replace Python 2.7+ timedelta call with code that also works in older versions --- script/daemon.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/daemon.py b/script/daemon.py index 212ff9c..b26fdc8 100644 --- a/script/daemon.py +++ b/script/daemon.py @@ -33,8 +33,10 @@ def generate_stats(get_processes): "free": usage.free } + uptime = (datetime.now() - datetime.fromtimestamp(psutil.BOOT_TIME)) + return_data = { - "uptime": (datetime.now() - datetime.fromtimestamp(psutil.BOOT_TIME)).total_seconds(), + "uptime": (uptime.microseconds + (uptime.seconds + uptime.days * 24 * 3600) * 10**6) / 10**6, "memory": { "total": mem.total, "available": mem.available,