Fix netCDF4 variable checks

Author: mraspaud

satpy/readers/geocat.py

@@ -37,7 +37,7 @@
 from pyproj import Proj
 from pyresample import geometry
 
-from satpy.readers.core.netcdf import NetCDF4FileHandler, netCDF4
+from satpy.readers.core.netcdf import NetCDF4FileHandler
 
 LOG = logging.getLogger(__name__)
 
@@ -204,7 +204,7 @@ def available_datasets(self, configured_datasets=None):
         for var_name, val in self.file_content.items():
             if var_name in handled_variables:
                 continue
-            if isinstance(val, netCDF4.Variable):
+            if self.accessor.is_variable(val):
                 ds_info = {
                     "file_type": self.filetype_info["file_type"],
                     "resolution": res,

satpy/readers/mimic_TPW2_nc.py

@@ -38,7 +38,7 @@
 import xarray as xr
 from pyresample.geometry import AreaDefinition
 
-from satpy.readers.core.netcdf import NetCDF4FileHandler, netCDF4
+from satpy.readers.core.netcdf import NetCDF4FileHandler
 
 logger = logging.getLogger(__name__)
 
@@ -85,7 +85,7 @@ def available_datasets(self, configured_datasets=None):
         # Iterate over dataset contents
         for var_name, val in self.file_content.items():
             # Only evaluate variables
-            if isinstance(val, netCDF4.Variable):
+            if self.accessor.is_variable(val):
                 logger.debug("Evaluating new variable: %s", var_name)
                 var_shape = self[var_name + "/shape"]
                 logger.debug("Dims:{}".format(var_shape))

satpy/readers/smos_l2_wind.py

@@ -30,7 +30,7 @@
 import numpy as np
 from pyresample.geometry import AreaDefinition
 
-from satpy.readers.core.netcdf import NetCDF4FileHandler, netCDF4
+from satpy.readers.core.netcdf import NetCDF4FileHandler
 
 logger = logging.getLogger(__name__)
 
@@ -81,7 +81,7 @@ def available_datasets(self, configured_datasets=None):
         # Iterate over dataset contents
         for var_name, val in self.file_content.items():
             # Only evaluate variables
-            if not isinstance(val, netCDF4.Variable):
+            if not self.accessor.is_variable(val):
                 continue
             if (var_name in handled_variables):
                 logger.debug("Already handled, skipping: %s", var_name)

satpy/readers/tropomi_l2.py

@@ -36,7 +36,7 @@
 import numpy as np
 import xarray as xr
 
-from satpy.readers.core.netcdf import NetCDF4FileHandler, netCDF4
+from satpy.readers.core.netcdf import NetCDF4FileHandler
 from satpy.utils import get_legacy_chunk_size
 
 logger = logging.getLogger(__name__)
@@ -139,7 +139,7 @@ def _iterate_over_dataset_contents(self, handled_variables, shape):
         """
         for var_name, val in self.file_content.items():
             # Only evaluate variables
-            if isinstance(val, netCDF4.Variable):
+            if self.accessor.is_variable(val):
                 logger.debug("Evaluating new variable: %s", var_name)
                 var_shape = self[var_name + "/shape"]
                 logger.debug("Dims:{}".format(var_shape))