Fix pyproj imports in CGrid_geo

phobson · May 3, 2019 · c4e3c6b · c4e3c6b
1 parent 11fd6fd
commit c4e3c6b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pygridgen/grid.py b/pygridgen/grid.py
@@ -630,9 +630,10 @@ def __init__(self, lon, lat, proj, use_gcdist=True, ellipse='WGS84'):
         try:
             import pyproj
         except ImportError:
-            from mpl_toolkits.basemap import pyproj
-        else:
-            raise ImportError('pyproj or mpltoolkits-basemap required')
+            try:
+                from mpl_toolkits.basemap import pyproj
+            except ImportError:
+                raise ImportError('pyproj or mpltoolkits-basemap required')
 
         x, y = proj(lon, lat)
         self.lon_vert = lon
@@ -690,7 +691,7 @@ def lat(self):
         """Shorthand for lat_vert"""
         return self.lat_vert
 
-    def mask_polygon_geo(lonlat_verts, mask_value=0.0):
+    def mask_polygon_geo(self, lonlat_verts, mask_value=0.0):
         lon, lat = zip(*lonlat_verts)
         x, y = proj(lon, lat, inverse=True)
         self.mask_polygon(zip(x, y), mask_value)