remove try/catch

ome · Feb 23, 2024 · 6923640 · 6923640
1 parent 4e04dc4
commit 6923640
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 40 deletions.
diff --git a/omero/export_scripts/Batch_Image_Export.py b/omero/export_scripts/Batch_Image_Export.py
@@ -42,10 +42,7 @@
 import zipfile
 from datetime import datetime
 
-try:
-    from PIL import Image  # see ticket:2597
-except ImportError:
-    import Image
+from PIL import Image
 
 # keep track of log strings.
 log_strings = []

diff --git a/omero/export_scripts/Make_Movie.py b/omero/export_scripts/Make_Movie.py
@@ -48,16 +48,9 @@
 from omero.constants.metadata import NSMOVIE
 
 from io import BytesIO
-try:
-    from types import StringTypes
-except ImportError:
-    StringTypes = str
-
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
+from types import StringTypes
+
+from PIL import Image, ImageDraw
 
 COLOURS = script_utils.COLOURS
 COLOURS.update(script_utils.EXTRA_COLOURS)    # name:(rgba) map

diff --git a/omero/figure_scripts/Movie_Figure.py b/omero/figure_scripts/Movie_Figure.py
@@ -47,11 +47,7 @@
 from datetime import date
 import math
 
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
+from PIL import Image, ImageDraw
 
 COLOURS = script_utils.COLOURS    # name:(rgba) map
 OVERLAY_COLOURS = dict(COLOURS, **script_utils.EXTRA_COLOURS)

diff --git a/omero/figure_scripts/Movie_ROI_Figure.py b/omero/figure_scripts/Movie_ROI_Figure.py
@@ -46,11 +46,7 @@
 import io
 from datetime import date
 
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
+from PIL import Image, ImageDraw
 
 
 COLOURS = script_utils.COLOURS

diff --git a/omero/figure_scripts/ROI_Split_Figure.py b/omero/figure_scripts/ROI_Split_Figure.py
@@ -44,11 +44,7 @@
 import io
 from datetime import date
 
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
+from PIL import Image, ImageDraw
 
 
 COLOURS = script_utils.COLOURS    # name:(rgba) map

diff --git a/omero/figure_scripts/Split_View_Figure.py b/omero/figure_scripts/Split_View_Figure.py
@@ -43,11 +43,7 @@
 import io
 from datetime import date
 
-try:
-    from PIL import Image, ImageDraw  # see ticket:2597
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
+from PIL import Image, ImageDraw
 
 COLOURS = script_utils.COLOURS    # name:(rgba) map
 OVERLAY_COLOURS = dict(COLOURS, **script_utils.EXTRA_COLOURS)

diff --git a/omero/figure_scripts/Thumbnail_Figure.py b/omero/figure_scripts/Thumbnail_Figure.py
@@ -41,12 +41,7 @@
 from omero.constants.namespaces import NSCREATED
 import os
 
-try:
-    from PIL import Image, ImageDraw, ImageFont
-except ImportError:
-    import Image
-    import ImageDraw  # see ticket:2597
-    import ImageFont
+from PIL import Image, ImageDraw, ImageFont
 
 from omero.gateway import THISPATH as GATEWAYPATH