Skip to content

Commit 0d47e38

Browse files
committed
Refactor omero_reader imports
1 parent 543ecf0 commit 0d47e38

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

bioformats/formatreader.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,13 @@
5050
from . import metadatatools as metadatatools
5151
import javabridge as javabridge
5252

53-
from omero_reader import OmeroReader
54-
from omero_reader.utils import omero_on_the_path, omero_reader_enabled
53+
OMERO_READER_IMPORTED = False
54+
try:
55+
from omero_reader import OmeroReader, OMERO_IMPORTED
56+
from omero_reader.utils import omero_reader_enabled
57+
OMERO_READER_IMPORTED = True
58+
except ImportError:
59+
pass
5560

5661
K_OMERO_SERVER = "omero_server"
5762
K_OMERO_PORT = "omero_port"
@@ -930,7 +935,8 @@ def get_image_reader(key, path=None, url=None):
930935
# is True OMERO python reader can be used to directly request
931936
# the image pixels from the server.
932937
# Following this route gives almost 10x speed up.
933-
if omero_on_the_path() and omero_reader_enabled() and \
938+
if OMERO_READER_IMPORTED and OMERO_IMPORTED and \
939+
omero_reader_enabled() and \
934940
url is not None and url.lower().startswith("omero:"):
935941
logger.debug("Initializing Python reader.")
936942
rdr = OmeroReader(__omero_server, __omero_session_id, url=url)

0 commit comments

Comments
 (0)