[hdf-compass] 273/295: Minor fix to manage issues in loading geo_c on some platforms

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit db1d09b0fd8d6ea23261dbb621706b86a9205423
Author: giumas <giumas at yahoo.it>
Date:   Sat Apr 23 10:54:34 2016 -0400

    Minor fix to manage issues in loading geo_c on some platforms
---
 hdf_compass/bag_model/model.py                 | 6 +++---
 hdf_compass/compass_viewer/geo_array/plot.py   | 2 +-
 hdf_compass/compass_viewer/geo_surface/plot.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hdf_compass/bag_model/model.py b/hdf_compass/bag_model/model.py
index abd9a92..fd81052 100644
--- a/hdf_compass/bag_model/model.py
+++ b/hdf_compass/bag_model/model.py
@@ -336,7 +336,7 @@ class BAGElevationGeoArray(compass_model.GeoArray):
         # for GeoSurface we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
         try:
             import cartopy.crs as ccrs
-        except ImportError:
+        except (ImportError, OSError):
             return False
         return (key == "/BAG_root/elevation") and (key in store) and (isinstance(store.f[key], h5py.Dataset))
 
@@ -388,7 +388,7 @@ class BAGElevation(compass_model.GeoSurface):
         # for GeoSurface we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
         try:
             import cartopy.crs as ccrs
-        except ImportError:
+        except (ImportError, OSError):
             return False
         # for GeoSurface we are using a matplotlib function present after 1.5.x
         import matplotlib
@@ -705,7 +705,7 @@ class BAGUncertainty(compass_model.GeoArray):
         # for GeoSurface we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
         try:
             import cartopy.crs as ccrs
-        except ImportError:
+        except (ImportError, OSError):
             return False
         return (key == "/BAG_root/uncertainty") and (key in store) and (isinstance(store.f[key], h5py.Dataset))
 
diff --git a/hdf_compass/compass_viewer/geo_array/plot.py b/hdf_compass/compass_viewer/geo_array/plot.py
index cc0141e..7bc7035 100644
--- a/hdf_compass/compass_viewer/geo_array/plot.py
+++ b/hdf_compass/compass_viewer/geo_array/plot.py
@@ -20,7 +20,7 @@ import wx
 try:  # for GeoArray we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
     import cartopy.crs as ccrs
     from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
-except ImportError:
+except (ImportError, OSError):
     pass
 import matplotlib.pyplot as plt
 from matplotlib.figure import Figure
diff --git a/hdf_compass/compass_viewer/geo_surface/plot.py b/hdf_compass/compass_viewer/geo_surface/plot.py
index 3670c65..32b0a2b 100644
--- a/hdf_compass/compass_viewer/geo_surface/plot.py
+++ b/hdf_compass/compass_viewer/geo_surface/plot.py
@@ -20,7 +20,7 @@ import wx
 try:  # for GeoSurface we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
     import cartopy.crs as ccrs
     from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
-except ImportError:
+except (ImportError, OSError):
     pass
 import matplotlib.pyplot as plt
 from matplotlib.figure import Figure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hdf-compass.git