h5netcdf 1.3.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

h5netcdf/dimensions.py

@@ -2,7 +2,6 @@ import weakref
 from collections import OrderedDict
 from collections.abc import MutableMapping
 
-import h5py
 import numpy as np
 
 
@@ -23,7 +22,7 @@ class Dimensions(MutableMapping):
         if not self._group._root._writable:
             raise RuntimeError("H5NetCDF: Write to read only")
         if name in self._objects:
-            raise ValueError("dimension %r already exists" % name)
+            raise ValueError(f"dimension {name:!r} already exists")
 
         self._objects[name] = Dimension(self._group, name, size, create_h5ds=True)
 
@@ -48,9 +47,8 @@ class Dimensions(MutableMapping):
     def __repr__(self):
         if self._group._root._closed:
             return "<Closed h5netcdf.Dimensions>"
-        return "<h5netcdf.Dimensions: %s>" % ", ".join(
-            f"{k}={v!r}" for k, v in self._objects.items()
-        )
+        dims = ", ".join(f"{k}={v!r}" for k, v in self._objects.items())
+        return f"<h5netcdf.Dimensions: {dims}>"
 
 
 def _join_h5paths(parent_path, child_path):
@@ -138,7 +136,7 @@ class Dimension:
 
     @property
     def _isscale(self):
-        return h5py.h5ds.is_scale(self._h5ds.id)
+        return self._root._h5py.h5ds.is_scale(self._h5ds.id)
 
     @property
     def _dimid(self):
@@ -151,8 +149,7 @@ class Dimension:
 
         if not self.isunlimited():
             raise ValueError(
-                "Dimension '%s' is not unlimited and thus cannot be resized."
-                % self.name
+                f"Dimension '{self.name}' is not unlimited and thus cannot be resized."
             )
         self._h5ds.resize((size,))
 
@@ -234,7 +231,7 @@ class Dimension:
 
     def __repr__(self):
         if not self._phony and self._parent._root._closed:
-            return "<Closed %s>" % self._cls_name
+            return f"<Closed {self._cls_name}>"
         special = ""
         if self._phony:
             special += " (phony_dim)"

h5netcdf/legacyapi.py

@@ -41,8 +41,7 @@ def _check_return_dtype_endianess(endian="native"):
         pass
     else:
         raise ValueError(
-            "'endian' keyword argument must be 'little','big' or 'native', got '%s'"
-            % endian
+            f"'endian' keyword argument must be 'little','big' or 'native', got '{endian}'"
         )
     return endianess
 
@@ -105,22 +104,44 @@ class Variable(core.BaseVariable, HasAttributesMixin):
 
     @property
     def dtype(self):
-        """Return netCDF4.Variable datatype."""
+        """Return netCDF4.Variable numpy dtype."""
         dt = self._h5ds.dtype
         if h5py.check_dtype(vlen=dt) is str:
             return str
         return dt
 
 
+class EnumType(core.EnumType):
+    _cls_name = "h5netcdf.legacyapi.EnumType"
+
+
+class VLType(core.VLType):
+    _cls_name = "h5netcdf.legacyapi.VLType"
+
+
+class CompoundType(core.CompoundType):
+    _cls_name = "h5netcdf.legacyapi.CompoundType"
+
+
+class UserType(core.UserType):
+    _cls_name = "h5netcdf.legacyapi.UserType"
+
+
 class Group(core.Group, HasAttributesMixin):
     _cls_name = "h5netcdf.legacyapi.Group"
     _variable_cls = Variable
+    _enumtype_cls = EnumType
+    _vltype_cls = VLType
+    _cmptype_cls = CompoundType
 
     @property
     def _group_cls(self):
         return Group
 
     createGroup = core.Group.create_group
+    createEnumType = core.Group.create_enumtype
+    createVLType = core.Group.create_vltype
+    createCompoundType = core.Group.create_cmptype
 
     def createDimension(self, name, size):
         """Creates a new dimension with given name and size.
@@ -161,8 +182,8 @@ class Group(core.Group, HasAttributesMixin):
         varname : str
             Name of the new variable. If given as a path, intermediate groups will be created,
             if not existent.
-        datatype : numpy.dtype, str
-            Dataype of the new variable
+        datatype : numpy.dtype, str, UserType (Enum, VL, Compound)
+            Datatype of the new variable.
         dimensions : tuple
             Tuple containing dimension name strings. Defaults to empty tuple, effectively
             creating a scalar variable.