From 42355aa3962495c00aa396535280efd1dbf15065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Bron=C3=A8s?= <romain.brones@synchrotron-soleil.fr>
Date: Tue, 4 Jun 2024 09:03:37 +0200
Subject: [PATCH] fix(TTS): Properly catch DevFailed on GetAttDefinitionData
* See issue #4
* TTS still unusable as is
---
ArchiveExtractor/Access.py | 9 ++++++++-
ArchiveExtractor/__init__.py | 2 +-
setup.py | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ArchiveExtractor/Access.py b/ArchiveExtractor/Access.py
index 7fa63ea..3a63e36 100644
--- a/ArchiveExtractor/Access.py
+++ b/ArchiveExtractor/Access.py
@@ -267,7 +267,14 @@ def infoattr(attribute, db='H'):
info = dict()
for func in ("GetAttDefinitionData", "GetAttPropertiesData"):
- R=getattr(ae._Extractors[{'H':0, 'T':1}[db]], func)(attribute)
+ try:
+ R=getattr(ae._Extractors[{'H':0, 'T':1}[db]], func)(attribute)
+ except tango.DevFailed:
+ logger.warning("Could not call command {} on extractor".format(func))
+ R=None
+
+ logger.debug(R)
+
if not R is None:
for i in R:
_s=i.split("::")
diff --git a/ArchiveExtractor/__init__.py b/ArchiveExtractor/__init__.py
index 9822d48..51e6a77 100644
--- a/ArchiveExtractor/__init__.py
+++ b/ArchiveExtractor/__init__.py
@@ -18,7 +18,7 @@ Quick usage in ipython shell:
"""
# NB: Also change version number in setup.py
-__version__ = "2.4"
+__version__ = "2.4.1"
__all__ = ["Access", ]
diff --git a/setup.py b/setup.py
index b705f30..e6b5069 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from distutils.core import setup
setup(name='ArchiveExtractor',
- version='2.4', # NB Also change version number in __init__.py
+ version='2.4.1', # NB Also change version number in __init__.py
description='Python module for extracting data from Archive Extractor Tango Device.',
url='https://gitlab.synchrotron-soleil.fr/dg/archiveextractor',
license="GNU-GPL-v3",
--
GitLab