Review changes.

SciTools · Jul 21, 2022 · 4cb6aca · 4cb6aca
1 parent db2326b
commit 4cb6aca
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/lib/iris/experimental/ugrid/load.py b/lib/iris/experimental/ugrid/load.py
@@ -8,6 +8,8 @@
 Extensions to Iris' NetCDF loading to allow the construction of
 :class:`~iris.experimental.ugrid.mesh.Mesh`\\ es from UGRID data in the file.
 
+Eventual destination: :mod:`iris.fileformats.netcdf`.
+
 """
 from contextlib import contextmanager
 from itertools import groupby

diff --git a/lib/iris/experimental/ugrid/save.py b/lib/iris/experimental/ugrid/save.py
@@ -8,8 +8,7 @@
 Extensions to Iris' NetCDF saving to allow
 :class:`~iris.experimental.ugrid.mesh.Mesh` saving in UGRID format.
 
-Eventual destination: :mod:`iris.fileformats.netcdf` (plan to split that module
-into ``load`` and ``save`` in future).
+Eventual destination: :mod:`iris.fileformats.netcdf`.
 
 """
 from collections.abc import Iterable

diff --git a/lib/iris/fileformats/netcdf/__init__.py b/lib/iris/fileformats/netcdf/__init__.py
@@ -11,7 +11,12 @@
 Also refer to document 'NetCDF Climate and Forecast (CF) Metadata Conventions'.
 
 """
-from .loader import DEBUG, NetCDFDataProxy, load_cubes, logger
+import iris.config
+
+# Note: *must* be done before importing from submodules, as they also use this !
+logger = iris.config.get_logger(__name__)
+
+from .loader import DEBUG, NetCDFDataProxy, load_cubes
 from .saver import (
     CF_CONVENTIONS_VERSION,
     MESH_ELEMENTS,

diff --git a/lib/iris/fileformats/netcdf/loader.py b/lib/iris/fileformats/netcdf/loader.py
@@ -40,11 +40,8 @@
 # Show actions activation statistics.
 DEBUG = False
 
-# Configure the logger : shared logger for all in 'iris.fileformats.netcdf'.
-from .. import __name__ as _parent_module_name
-
-logger = iris.config.get_logger(_parent_module_name)
-del _parent_module_name
+# Get the logger : shared logger for all in 'iris.fileformats.netcdf'.
+from .. import logger
 
 
 def _actions_engine():

diff --git a/lib/iris/fileformats/netcdf/saver.py b/lib/iris/fileformats/netcdf/saver.py
@@ -46,12 +46,12 @@
 import iris.io
 import iris.util
 
-# Configure the logger : shared logger for all in 'iris.fileformats.netcdf'.
-from .. import __name__ as _parent_module_name
-
-logger = iris.config.get_logger(_parent_module_name)
-del _parent_module_name
+# Get the logger : shared logger for all in 'iris.fileformats.netcdf'.
+from .. import logger
 
+# Avoid warning about unused import.
+# We could use an __all__, but we don't want to maintain one here
+logger
 
 # Standard CML spatio-temporal axis names.
 SPATIO_TEMPORAL_AXES = ["t", "z", "y", "x"]