fix: restore Python 3.5 compatibility (ModuleNotFoundError -> ImportE…

…rror) (#933)
modflowpy · Jul 9, 2020 · d16411d · d16411d
1 parent f437e8b
commit d16411d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/flopy/export/utils.py b/flopy/export/utils.py
@@ -1508,7 +1508,7 @@ def export_contourf(filename, contours, fieldname='level', epsg=None,
 
     try:
         from shapely import geometry
-    except (ImportError, ModuleNotFoundError):
+    except ImportError:
         raise ImportError('export_contourf requires python shapely package')
 
     from ..utils.geometry import Polygon

diff --git a/flopy/utils/gridintersect.py b/flopy/utils/gridintersect.py
@@ -1,7 +1,7 @@
 import numpy as np
 try:
     import matplotlib.pyplot as plt
-except ModuleNotFoundError:
+except ImportError:
     plt = None
 
 from .geometry import transform
@@ -13,7 +13,7 @@
     from shapely.affinity import translate, rotate
     from shapely.prepared import prep
     shply = True
-except ModuleNotFoundError:
+except ImportError:
     shply = False
 
 
@@ -107,7 +107,7 @@ def __init__(self, mfgrid, method=None, rtree=True):
             msg = ("Shapely is needed for grid intersect operations! "
                    "Please install shapely if you need to use grid intersect "
                    "functionality.")
-            raise ModuleNotFoundError(msg)
+            raise ImportError(msg)
 
         self.mfgrid = mfgrid
         if method is None:
@@ -1240,16 +1240,16 @@ def plot_polygon(rec, ax=None, **kwargs):
         """
         try:
             from descartes import PolygonPatch
-        except ModuleNotFoundError:
+        except ImportError:
             msg = 'descartes package needed for plotting polygons'
             if plt is None:
                 msg = 'matplotlib and descartes packages needed for ' + \
                       'plotting polygons'
-            raise ModuleNotFoundError(msg)
+            raise ImportError(msg)
 
         if plt is None:
             msg = 'matplotlib package needed for plotting polygons'
-            raise ModuleNotFoundError(msg)
+            raise ImportError(msg)
 
         if ax is None:
             _, ax = plt.subplots()
@@ -1288,7 +1288,7 @@ def plot_linestring(rec, ax=None, **kwargs):
         """
         if plt is None:
             msg = 'matplotlib package needed for plotting polygons'
-            raise ModuleNotFoundError(msg)
+            raise ImportError(msg)
 
         if ax is None:
             _, ax = plt.subplots()
@@ -1333,7 +1333,7 @@ def plot_point(rec, ax=None, **kwargs):
         """
         if plt is None:
             msg = 'matplotlib package needed for plotting polygons'
-            raise ModuleNotFoundError(msg)
+            raise ImportError(msg)
 
         if ax is None:
             _, ax = plt.subplots()