linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

secop_mlz: remove dangerous try except ImportError + fix typo

Browse Source 
Change-Id: I11de901044c9400b6fe8e8779e6b05a5709d3e0f
Reviewed-on: https://forge.frm2.tum.de/review/20251
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber 2019-03-27 18:04:40 +01:00
parent 4068516178
commit 8ef28eb2cc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
secop_mlz/entangle.py
View File

@ -34,12 +34,8 @@ import threading
from time import time as currenttime from time import time as currenttime
from time import sleep from time import sleep
try:
import PyTango import PyTango
except ImportError:
pass
#from secop.parse import Parser
from secop.datatypes import ArrayOf, EnumType, \ from secop.datatypes import ArrayOf, EnumType, \
FloatRange, IntRange, StringType, TupleOf FloatRange, IntRange, StringType, TupleOf
from secop.errors import CommunicationFailedError, \ from secop.errors import CommunicationFailedError, \
@ -62,7 +58,7 @@ __all__ = [
] ]
EXC_MAPPING = { EXC_MAPPING = {
PyTango.CommunicationFailedError: CommunicationFailedError, PyTango.CommunicationFailed: CommunicationFailedError,
PyTango.WrongNameSyntax: ConfigError, PyTango.WrongNameSyntax: ConfigError,
PyTango.DevFailed: HardwareError, PyTango.DevFailed: HardwareError,
} }
@ -77,7 +73,7 @@ REASON_MAPPING = {
} }
# Tango DevFailed reasons that should not cause a retry # Tango DevFailed reasons that should not cause a retry
FATAL_REASONS = set(( FATAL_REASONS = {
'Entangle_ConfigurationError', 'Entangle_ConfigurationError',
'Entangle_UnrecognizedHardware', 'Entangle_UnrecognizedHardware',
'Entangle_WrongAPICall', 'Entangle_WrongAPICall',
@ -90,7 +86,7 @@ FATAL_REASONS = set((
'API_TangoHostNotSet', 'API_TangoHostNotSet',
'API_ServerNotRunning', 'API_ServerNotRunning',
'API_DeviceNotExported', 'API_DeviceNotExported',
)) }
def describe_dev_error(exc): def describe_dev_error(exc):