ietf-system: Return dates in correct format

1 files changed, 6 insertions, 6 deletions

diff --git a/ncserver/module/system.py b/ncserver/module/system.py
index f00eb2b..7e6616e 100644
--- a/ncserver/module/system.py
+++ b/ncserver/module/system.py
@@ -16,7 +16,7 @@ import platform
 import subprocess
 import time
 
-from datetime import datetime
+from datetime import datetime, timezone
 from math import floor
 from socket import gethostname
 
@@ -183,13 +183,13 @@ def operational(node):
     plat.append(util.leaf_elm('sys:machine', platform.machine()))
 
     clock = util.subelm(state, 'sys:clock')
-    clock.append(util.leaf_elm(
-        'sys:current-datetime',
-        datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%f')
-    ))
+    now = datetime.now(timezone.utc)
+    zone = now.astimezone().tzinfo
+    clock.append(util.leaf_elm('sys:current-datetime',
+                               datetime.now(zone).isoformat()))
 
     with open('/proc/uptime', 'r') as upfile:
         raw = upfile.read().split(' ')[0]
         boot = floor(time.time() - float(raw))
-        fmted = datetime.fromtimestamp(boot).strftime('%Y-%m-%dT%H:%M:%S.%f')
+        fmted = datetime.fromtimestamp(boot, tz=zone).isoformat()
         clock.append(util.leaf_elm('sys:boot-datetime', fmted))