From dc891466cbe529c42b11481a2e414549c2f172b5 Mon Sep 17 00:00:00 2001
From: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Date: Thu, 7 Sep 2017 16:37:03 +0200
Subject: [PATCH] fix formatting of timestamps

Change-Id: I92e714833f333b13257e8e54561aa18716d89ecb
---
 secop/client/baseclient.py          | 6 +++++-
 secop/protocol/encoding/__init__.py | 4 +++-
 secop_ess/epics.py                  | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/secop/client/baseclient.py b/secop/client/baseclient.py
index 47d4659..416b57a 100644
--- a/secop/client/baseclient.py
+++ b/secop/client/baseclient.py
@@ -138,12 +138,16 @@ class Value(object):
         self.value = value
         self.__dict__.update(qualifiers)
         if 't' in qualifiers:
-            self.t = parse_time(qualifiers['t'])
+            try:
+                self.t = float(qualifiers['t'])
+            except Exception:
+                self.t = parse_time(qualifiers['t'])
 
     def __repr__(self):
         r = []
         if self.t is not None:
             r.append("timestamp=%r" % format_time(self.t))
+            print("Check 3")
         if self.u is not None:
             r.append('unit=%r' % self.u)
         if self.e is not None:
diff --git a/secop/protocol/encoding/__init__.py b/secop/protocol/encoding/__init__.py
index 61e95bc..1aa5e9c 100644
--- a/secop/protocol/encoding/__init__.py
+++ b/secop/protocol/encoding/__init__.py
@@ -42,6 +42,7 @@ class MessageEncoder(object):
 from .demo_v2 import DemoEncoder as DemoEncoderV2
 from .demo_v3 import DemoEncoder as DemoEncoderV3
 from .demo_v4 import DemoEncoder as DemoEncoderV4
+from .demo_v5 import DemoEncoder as DemoEncoderV5
 from .text import TextEncoder
 from .pickle import PickleEncoder
 from .simplecomm import SCPEncoder
@@ -52,7 +53,8 @@ ENCODERS = {
     'demo_v2': DemoEncoderV2,
     'demo_v3': DemoEncoderV3,
     'demo_v4': DemoEncoderV4,
-    'demo': DemoEncoderV4,
+    'demo_v5': DemoEncoderV5,
+    'demo': DemoEncoderV5,
     'scp': SCPEncoder,
 }
 
diff --git a/secop_ess/epics.py b/secop_ess/epics.py
index e73c444..ca41b3f 100644
--- a/secop_ess/epics.py
+++ b/secop_ess/epics.py
@@ -22,7 +22,6 @@
 
 import random
 
-from secop.lib.parsing import format_time
 from secop.datatypes import EnumType, TupleOf, FloatRange, get_datatype, StringType
 from secop.modules import Readable, Device, Driveable, PARAM
 from secop.protocol import status