Distinguish local+global attributes in netcdf loads.

pp-mo · pp-mo · commit f736c4baa56b · 2023-07-20T15:12:43.000+01:00
diff --git a/lib/iris/fileformats/_nc_load_rules/helpers.py b/lib/iris/fileformats/_nc_load_rules/helpers.py
@@ -433,7 +433,7 @@ def build_cube_metadata(engine):
     # Set the cube global attributes.
     for attr_name, attr_value in cf_var.cf_group.global_attributes.items():
         try:
-            cube.attributes[str(attr_name)] = attr_value
+            cube.attributes.globals[str(attr_name)] = attr_value
         except ValueError as e:
             msg = "Skipping global attribute {!r}: {}"
             warnings.warn(msg.format(attr_name, str(e)))
diff --git a/lib/iris/fileformats/netcdf/loader.py b/lib/iris/fileformats/netcdf/loader.py
@@ -159,8 +159,13 @@ def attribute_predicate(item):
         return item[0] not in _CF_ATTRS
 
     tmpvar = filter(attribute_predicate, cf_var.cf_attrs_unused())
+    attrs_dict = iris_object.attributes
+    if hasattr(attrs_dict, "locals"):
+        # Treat cube attributes (i.e. a CubeAttrsDict) as a special case.
+        # These attrs are "local" (i.e. on the variable), so record them as such.
+        attrs_dict = attrs_dict.locals
     for attr_name, attr_value in tmpvar:
-        _set_attributes(iris_object.attributes, attr_name, attr_value)
+        _set_attributes(attrs_dict, attr_name, attr_value)
 
 
 def _get_actual_dtype(cf_var):
