Remove legacy PIL/Pillow compatibility try/except blocks

Pillow is a managed dependency of omero-py
ome · Feb 7, 2024 · c1f88b9 · c1f88b9
1 parent cd3a1a6
commit c1f88b9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 52 deletions.
diff --git a/src/omero/gateway/__init__.py b/src/omero/gateway/__init__.py
@@ -56,17 +56,7 @@
 logger = logging.getLogger(__name__)
 THISPATH = os.path.dirname(os.path.abspath(__file__))
 
-try:
-    from PIL import Image, ImageDraw, ImageFont     # see ticket:2597
-except:  # pragma: nocover
-    try:
-        # see ticket:2597
-        import Image
-        import ImageDraw
-        import ImageFont
-    except:
-        logger.error(
-            'No Pillow installed, line plots and split channel will fail!')
+from PIL import Image, ImageDraw, ImageFont
 
 
 def omero_type(val):

diff --git a/src/omero/util/ROIDrawingUtils.py b/src/omero/util/ROIDrawingUtils.py
@@ -53,10 +53,7 @@
 
 Example code to draw a polyline on an image an display it in PIL::
 
-    try:
-        from PIL import Image, ImageDraw # see ticket:2597
-    except ImportError:
-        import Image, ImageDraw # see ticket:2597
+    from PIL import Image, ImageDraw
 
     import ROI_utils
     import ROIDrawingUtils
@@ -72,11 +69,7 @@
 """
 
 
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
+from PIL import Image, ImageDraw
 
 import warnings
 

diff --git a/src/omero/util/figureUtil.py b/src/omero/util/figureUtil.py
@@ -29,11 +29,7 @@
 publication type of figures.
 """
 
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw
+from PIL import Image, ImageDraw
 
 WHITE = (255, 255, 255)
 

diff --git a/src/omero/util/imageUtil.py b/src/omero/util/imageUtil.py
@@ -29,12 +29,7 @@
 used for making figures.
 """
 
-try:
-    from PIL import Image, ImageDraw, ImageFont  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw
-    import ImageFont  # see ticket:2597
+from PIL import Image, ImageDraw, ImageFont
 
 import os.path
 import omero.gateway

diff --git a/src/omero/util/image_utils.py b/src/omero/util/image_utils.py
@@ -22,12 +22,7 @@
 Utility methods for dealing with scripts.
 """
 
-try:
-    from PIL import Image, ImageDraw, ImageFont  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw
-    import ImageFont  # see ticket:2597
+from PIL import Image, ImageDraw, ImageFont
 
 import os.path
 import omero.gateway

diff --git a/src/omero/util/script_utils.py b/src/omero/util/script_utils.py
@@ -43,13 +43,7 @@
     import sha
     hash_sha1 = sha.new
 
-try:
-    from PIL import Image  # see ticket:2597
-except:  # pragma: nocover
-    try:
-        import Image  # see ticket:2597
-    except:
-        logging.error('No Pillow installed')
+from PIL import Image
 
 # r,g,b,a colours for use in scripts.
 COLOURS = {
@@ -918,10 +912,7 @@ def split_image(client, imageId, dir,
     raw_pixels_store = session.createRawPixelsStore()
     pixels_service = session.getPixelsService()
 
-    try:
-        from PIL import Image   # see ticket:2597
-    except:
-        import Image        # see ticket:2597
+    from PIL import Image
 
     query_string = "select p from Pixels p join fetch p.image " \
                    "as i join fetch p.pixelsType where i.id='%s'" % imageId

diff --git a/test/unit/test_util.py b/test/unit/test_util.py
@@ -36,10 +36,7 @@
     get_omero_userdir, get_omero_user_cache_dir, get_user_dir)
 from omero_version import omero_version
 import omero.util.image_utils as image_utils
-try:
-    from PIL import Image
-except ImportError:
-    import Image
+from PIL import Image
 import numpy