rework EnumType to use better Enum's
unfortunately IntEnum can't be bent like we would need it (extensible). So we had to write our own.... The members of the Enum still behave like ints, but also have .name and .value attributes, should they be needed. needed adoptions to correctly use (and test) the EnumType are included. Change-Id: Ie019d2f449a244c4fab00554b6c6daaac8948b59 Reviewed-on: https://forge.frm2.tum.de/review/17843 Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de> Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
@ -41,8 +41,8 @@ except ImportError:
|
||||
|
||||
import mlzlog
|
||||
|
||||
from secop.datatypes import get_datatype
|
||||
from secop.lib import mkthread, formatException
|
||||
from secop.datatypes import get_datatype, EnumType
|
||||
from secop.lib import mkthread, formatException, formatExtendedStack
|
||||
from secop.lib.parsing import parse_time, format_time
|
||||
#from secop.protocol.encoding import ENCODERS
|
||||
#from secop.protocol.framing import FRAMERS
|
||||
@ -226,6 +226,7 @@ class Client(object):
|
||||
try:
|
||||
self._inner_run()
|
||||
except Exception as err:
|
||||
print(formatExtendedStack())
|
||||
self.log.exception(err)
|
||||
raise
|
||||
|
||||
@ -383,6 +384,11 @@ class Client(object):
|
||||
for module, moduleData in self.describing_data['modules'].items():
|
||||
for parameter, parameterData in moduleData['parameters'].items():
|
||||
datatype = get_datatype(parameterData['datatype'])
|
||||
# *sigh* special handling for 'some' parameters....
|
||||
if isinstance(datatype, EnumType):
|
||||
datatype._enum.name = parameter
|
||||
if parameter == 'status':
|
||||
datatype.subtypes[0]._enum.name = 'status'
|
||||
self.describing_data['modules'][module]['parameters'] \
|
||||
[parameter]['datatype'] = datatype
|
||||
for _cmdname, cmdData in moduleData['commands'].items():
|
||||
|
Reference in New Issue
Block a user