Fix Mesh -> MeshXY in experimental.ugrid

lib/iris/experimental/ugrid.py

@@ -29,8 +29,8 @@
 from .._deprecation import warn_deprecated
 from ..ugrid.load import PARSE_UGRID_ON_LOAD, load_mesh, load_meshes
 from ..ugrid.mesh import Connectivity as _Connectivity
-from ..ugrid.mesh import Mesh as _Mesh
 from ..ugrid.mesh import MeshCoord as _MeshCoord
+from ..ugrid.mesh import MeshXY as _MeshXY
 from ..ugrid.save import save_mesh
 from ..ugrid.utils import recombine_submeshes
 
@@ -45,7 +45,7 @@
 # We couldn't fix this with "autodoc_suppress_warnings", so the solution for now is to
 # wrap the classes.  Which is really ugly.
 # TODO: remove this when we remove iris.experimental.ugrid
-class Mesh(_Mesh):
+class MeshXY(_MeshXY):
     pass
 
 
@@ -59,8 +59,8 @@ class Connectivity(_Connectivity):
 
 __all__ = [
     "Connectivity",
-    "Mesh",
     "MeshCoord",
+    "MeshXY",
     "PARSE_UGRID_ON_LOAD",
     "load_mesh",
     "load_meshes",

lib/iris/tests/stock/__init__.py

@@ -15,14 +15,14 @@
 import numpy as np
 import numpy.ma as ma
 
+from iris import ugrid
 from iris.analysis import cartography
 import iris.aux_factory
 from iris.coord_systems import GeogCS, RotatedGeogCS
 import iris.coords
 import iris.coords as icoords
 from iris.coords import AncillaryVariable, AuxCoord, CellMeasure, CellMethod, DimCoord
 from iris.cube import Cube
-from iris.experimental import ugrid
 from iris.util import mask_cube
 
 from ._stock_2d_latlons import (  # noqa
@@ -837,7 +837,7 @@ def flatten_dim_metadata(dim_metadata: icoords._DimensionalMetadata):
         new_instance = dim_metadata.__class__(flat_values, **kwargs)
         return new_instance
 
-    def remove_duplicate_nodes(mesh: iris.ugrid.MeshXY):
+    def remove_duplicate_nodes(mesh: ugrid.MeshXY):
         """Remove duplicate nodes from a mesh.
 
         MeshXY.from_coords() does not do this due to complications like lazy