Merge pull request #2179 from marqh/netcdfstring

catch setting of coordiantes and bounds for netcdf saver (string typing)

Author: pelson

lib/iris/fileformats/netcdf.py

@@ -1100,8 +1100,8 @@ def _add_aux_coords(self, cube, cf_var_cube, dimension_names):
         # Add CF-netCDF auxiliary coordinate variable references to the
         # CF-netCDF data variable.
         if auxiliary_coordinate_names:
-            cf_var_cube.coordinates = ' '.join(
-                sorted(auxiliary_coordinate_names))
+            coord_variable_names = ' '.join(sorted(auxiliary_coordinate_names))
+            _setncattr(cf_var_cube, 'coordinates', coord_variable_names)
 
     def _add_cell_measures(self, cube, cf_var_cube, dim_names):
         """
@@ -1135,8 +1135,8 @@ def _add_cell_measures(self, cube, cf_var_cube, dim_names):
         # Add CF-netCDF cell measure variable references to the
         # CF-netCDF data variable.
         if cell_measure_names:
-            cf_var_cube.cell_measures = ' '.join(
-                sorted(cell_measure_names))
+            cm_var_names = ' '.join(sorted(cell_measure_names))
+            _setncattr(cf_var_cube, 'cell_measures', cm_var_names)
 
     def _add_dim_coords(self, cube, dimension_names):
         """
@@ -1225,7 +1225,7 @@ def _add_aux_factories(self, cube, cf_var_cube, dimension_names):
                                                             primary_coord)
                             cf_var = self._dataset.variables[name]
                             _setncattr(cf_var, 'standard_name', std_name)
-                            cf_var.axis = 'Z'
+                            _setncattr(cf_var, 'axis', 'Z')
                             # Update the formula terms.
                             ft = formula_terms.split()
                             ft = [name if t == cf_name else t for t in ft]
@@ -1235,10 +1235,11 @@ def _add_aux_factories(self, cube, cf_var_cube, dimension_names):
                         # Update the associated cube variable.
                         coords = cf_var_cube.coordinates.split()
                         coords = [name if c == cf_name else c for c in coords]
-                        cf_var_cube.coordinates = ' '.join(coords)
+                        _setncattr(cf_var_cube, 'coordinates',
+                                   ' '.join(coords))
                 else:
                     _setncattr(cf_var, 'standard_name', std_name)
-                    cf_var.axis = 'Z'
+                    _setncattr(cf_var, 'axis', 'Z')
                     _setncattr(cf_var, 'formula_terms', formula_terms)
 
     def _get_dim_names(self, cube):
@@ -1382,7 +1383,7 @@ def _create_cf_bounds(self, coord, cf_var, cf_name):
                 # Create the bounds dimension with the appropriate extent.
                 self._dataset.createDimension(bounds_dimension_name, n_bounds)
 
-            cf_var.bounds = cf_name + '_bnds'
+            _setncattr(cf_var, 'bounds', cf_name + '_bnds')
             cf_var_bounds = self._dataset.createVariable(
                 cf_var.bounds, bounds.dtype.newbyteorder('='),
                 cf_var.dimensions + (bounds_dimension_name,))
@@ -1481,7 +1482,7 @@ def _create_cf_cell_measure_variable(self, cube, dimension_names,
         cf_var[:] = data
 
         if cell_measure.units != 'unknown':
-            cf_var.units = str(cell_measure.units)
+            _setncattr(cf_var, 'units', str(cell_measure.units))
 
         if cell_measure.standard_name is not None:
             _setncattr(cf_var, 'standard_name', cell_measure.standard_name)
@@ -1577,7 +1578,7 @@ def _create_cf_variable(self, cube, dimension_names, coord):
             if coord in cf_coordinates:
                 axis = iris.util.guess_coord_axis(coord)
                 if axis is not None and axis.lower() in SPATIO_TEMPORAL_AXES:
-                    cf_var.axis = axis.upper()
+                    _setncattr(cf_var, 'axis', axis.upper())
 
             # Add the data to the CF-netCDF variable.
             cf_var[:] = points
@@ -1589,7 +1590,7 @@ def _create_cf_variable(self, cube, dimension_names, coord):
         standard_name, long_name, units = self._cf_coord_identity(coord)
 
         if units != 'unknown':
-            cf_var.units = units
+            _setncattr(cf_var, 'units', units)
 
         if standard_name is not None:
             _setncattr(cf_var, 'standard_name', standard_name)
@@ -1801,7 +1802,7 @@ def add_ellipsoid(ellipsoid):
                 self._coord_systems.append(cs)
 
             # Refer to grid var
-            cf_var_cube.grid_mapping = cs.grid_mapping_name
+            _setncattr(cf_var_cube, 'grid_mapping', cs.grid_mapping_name)
 
     def _create_cf_data_variable(self, cube, dimension_names, local_keys=None,
                                  **kwargs):

lib/iris/tests/unit/fileformats/netcdf/test_Saver.py

@@ -513,14 +513,19 @@ def _grid_mapping_variable(self, coord_system):
                             createVariable=create_var_fn)
         saver = mock.Mock(spec=Saver, _coord_systems=[],
                           _dataset=dataset)
-        variable = mock.Mock()
+
+        class NCMock(mock.Mock):
+            def setncattr(self, name, attr):
+                setattr(self, name, attr)
+
+        variable = NCMock()
 
         # This is the method we're actually testing!
         Saver._create_cf_grid_mapping(saver, cube, variable)
 
         self.assertEqual(create_var_fn.call_count, 1)
         self.assertEqual(variable.grid_mapping,
-                         grid_variable.grid_mapping_name)
+                         str.encode(grid_variable.grid_mapping_name))
         return grid_variable
 
     def _variable_attributes(self, coord_system):