#380 tools: split import of matplotlib and basemap

nansencenter · Sep 19, 2018 · 66ec289 · 66ec289
1 parent 243437c
commit 66ec289
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/nansat/tools.py b/nansat/tools.py
@@ -22,20 +22,25 @@
 from dateutil.parser import parse
 
 try:
+    import matplotlib
     if 'DISPLAY' not in os.environ:
-        import matplotlib; matplotlib.use('Agg')
-    from matplotlib import cm
+        matplotlib.use('Agg')
     import matplotlib.pyplot as plt
     from matplotlib.colors import hex2color
-    from mpl_toolkits.basemap import Basemap
+    from matplotlib import cm
     from matplotlib.patches import Polygon
 except ImportError:
-    BASEMAP_LIB_IS_INSTALLED = False
     MATPLOTLIB_IS_INSTALLED = False
 else:
-    BASEMAP_LIB_IS_INSTALLED = True
     MATPLOTLIB_IS_INSTALLED = True
 
+try:
+    from mpl_toolkits.basemap import Basemap
+except ImportError:
+    BASEMAP_LIB_IS_INSTALLED = False
+else:
+    BASEMAP_LIB_IS_INSTALLED = True
+
 import numpy as np
 
 try: