netcdf_filearry -> scipynetcdffilearray

Author: davidhassell

cf/__init__.py

@@ -153,12 +153,12 @@
     H5netcdfArray,
     NetCDFArray,
     NetCDF4Array,
-    Netcdf_fileArray,
     PyfiveArray,
     PointTopologyArray,
     RaggedContiguousArray,
     RaggedIndexedArray,
     RaggedIndexedContiguousArray,
+    ScipyNetcdfFileArray,
     SubsampledArray,
     UMArray,
     ZarrArray,

cf/cfimplementation.py

@@ -34,12 +34,12 @@
     GatheredArray,
     H5netcdfArray,
     NetCDF4Array,
-    Netcdf_fileArray,
     PointTopologyArray,
     PyfiveArray,
     RaggedContiguousArray,
     RaggedIndexedArray,
     RaggedIndexedContiguousArray,
+    ScipyNetcdfFileArray,
     SubsampledArray,
     ZarrArray,
 )
@@ -149,7 +149,7 @@ def set_construct(self, parent, construct, axes=None, copy=True, **kwargs):
     GatheredArray=GatheredArray,
     H5netcdfArray=H5netcdfArray,
     NetCDF4Array=NetCDF4Array,
-    Netcdf_fileArray=Netcdf_fileArray,
+    ScipyNetcdfFileArray=ScipyNetcdfFileArray,
     PointTopologyArray=PointTopologyArray,
     PyfiveArray=PyfiveArray,
     Quantization=Quantization,
@@ -208,7 +208,7 @@ def implementation():
      'GatheredArray': cf.data.array.gatheredarray.GatheredArray,
      'H5netcdfArray': cf.data.array.h5netcdfarray.H5netcdfArray,
      'NetCDF4Array': cf.data.array.netcdf4array.NetCDF4Array,
-     'Netcdf_fileArray': cf.data.array.netcdf_filearray.Netcdf_fileArray,
+     'ScipyNetcdfFileArray': cf.data.array.scipynetcdffilearray.ScipyNetcdfFileArray,
      'PointTopologyArray': <class 'cf.data.array.pointtopologyarray.PointTopologyArray'>,
      'PyfiveArray': cf.data.array.pyfivearray.PyfiveArray,
      'Quantization': cf.quantization.Quantization,

cf/data/array/__init__.py

@@ -6,7 +6,7 @@
 from .h5netcdfarray import H5netcdfArray
 from .netcdfarray import NetCDFArray
 from .netcdf4array import NetCDF4Array
-from .netcdf_filearray import Netcdf_fileArray
+from .scipynetcdffilearray import ScipyNetcdfFileArray
 from .pointtopologyarray import PointTopologyArray
 from .pyfivearray import PyfiveArray
 from .raggedcontiguousarray import RaggedContiguousArray

cf/data/array/netcdf_filearray.py cf/data/array/scipynetcdffilearray.pycf/data/array/netcdf_filearray.py renamed to cf/data/array/scipynetcdffilearray.py

@@ -3,9 +3,9 @@
 from ...mixin_container import Container
 
 
-class Netcdf_fileArray(
+class ScipyNetcdfFileArray(
     Container,
-    cfdm.Netcdf_fileArray,
+    cfdm.ScipyNetcdfFileArray,
 ):
     """A netCDF-3 array accessed with `scipy.io.netcdf_file`.
 

cf/test/test_read_write.py

@@ -956,6 +956,15 @@ def test_read_zarr(self):
             z = cf.read(zarr_dataset, dataset_type="Zarr")
             self.assertEqual(len(z), 1)
 
+    def test_read_netcdf_file(self):
+        """Test cf.read for differing the netcdf_file backend."""
+        f = self.f0
+
+        cf.write(f, tmpfile, fmt="NETCDF3_CLASSIC")
+        g = cf.read(tmpfile, netcdf_backend="netcdf_file")[0]
+
+        self.assertTrue(g.equals(f))
+
 
 if __name__ == "__main__":
     print("Run date:", datetime.datetime.now())