From 8ef28eb2ccce4ab2b8a184012f98c4d39a146133 Mon Sep 17 00:00:00 2001
From: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Date: Wed, 27 Mar 2019 18:04:40 +0100
Subject: [PATCH] secop_mlz: remove dangerous try except ImportError + fix typo

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>
---
 secop_mlz/entangle.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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