From c5f3b113a831f8e47744cc7a771ee0b5a48ce6e6 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 16 Jul 2019 15:33:35 +0200 Subject: [PATCH] fixes in datatype.py - in DATATYPES, arguments for CommandType must be optional - added default value for Enum Change-Id: I967efe3418960ad587d989d22412f6a834257171 Reviewed-on: https://forge.frm2.tum.de/review/20923 Tested-by: JenkinsCodeReview Reviewed-by: Enrico Faulhaber Reviewed-by: Markus Zolliker --- secop/datatypes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/secop/datatypes.py b/secop/datatypes.py index 9c5df33..d55fbb1 100644 --- a/secop/datatypes.py +++ b/secop/datatypes.py @@ -315,6 +315,7 @@ class EnumType(DataType): kwds.update(kwds[u'members']) kwds.pop(u'members') self._enum = Enum(enum_or_name, **kwds) + self.default = self._enum[self._enum.members[0]] def copy(self): # as the name is not exported, we have to implement copy ourselfs @@ -863,7 +864,7 @@ DATATYPES = dict( enum =lambda members={}: EnumType('', members=members), struct =lambda optional=None, members=None: StructOf(optional, **dict((n, get_datatype(t)) for n, t in list(members.items()))), - command = lambda argument, result: CommandType(get_datatype(argument), get_datatype(result)), + command = lambda argument=None, result=None: CommandType(get_datatype(argument), get_datatype(result)), )