Merge pull request #1 from pp-mo/vlen_safe_nc

Use 'safe-access' version of netCDF4.VLType

Author: ukmo-ccbunney

lib/iris/fileformats/netcdf/_thread_safe_nc.py

@@ -20,6 +20,7 @@
 # Doesn't need thread protection, but this allows all netCDF4 refs to be
 #  replaced with thread_safe refs.
 default_fillvals = netCDF4.default_fillvals
+VLType = netCDF4.VLType
 
 
 class _ThreadSafeWrapper(ABC):

lib/iris/fileformats/netcdf/loader.py

@@ -225,7 +225,7 @@ def _get_cf_var_data(cf_var, filename):
         # data; see https://github.com/Unidata/netcdf-c/issues/1893.
         # Note: "Variable length" netCDF types have a datatype of `nc.VLType`.
         if isinstance(
-            getattr(cf_var, "datatype", None), _thread_safe_nc.netCDF4.VLType
+            getattr(cf_var, "datatype", None), _thread_safe_nc.VLType
         ):
             msg = (
                 f"NetCDF variable `{cf_var.cf_name}` is a variable length type of kind {cf_var.dtype} "

lib/iris/tests/unit/fileformats/netcdf/loader/test__get_cf_var_data.py

@@ -11,11 +11,11 @@
 from unittest import mock
 
 import dask.array as da
-from netCDF4 import VLType
 import numpy as np
 
 from iris._lazy_data import _optimum_chunksize
 import iris.fileformats.cf
+from iris.fileformats.netcdf._thread_safe_nc import VLType
 from iris.fileformats.netcdf.loader import CHUNK_CONTROL, _get_cf_var_data