Skip to content

Commit

Permalink
Merge pull request #1039 from vasole/redis
Browse files Browse the repository at this point in the history
Adapt to blissdata
  • Loading branch information
vasole authored Oct 19, 2023
2 parents 089b407 + 5c45008 commit c240435
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions PyMca5/PyMcaCore/RedisTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@
_logger = logging.getLogger(__name__)

from bliss.config import get_sessions_list
from bliss.config.settings import scan as rdsscan
from bliss.data.node import get_node, get_nodes
try:
from blissdata.settings import scan as rdsscan
from blissdata.data.node import get_node, get_nodes
except ImportError:
_logger.info("Trying deprecated access to Redis")
from bliss.config.settings import scan as rdsscan
from bliss.data.node import get_node, get_nodes

_NODE_TYPES = [ "channel",
"lima",
Expand Down

0 comments on commit c240435

Please sign in to comment.