Fix style issues

ESMValGroup · Mar 18, 2019 · 108b35c · 108b35c
1 parent ea034a6
commit 108b35c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/esmvaltool/preprocessor/_derive/amoc.py b/esmvaltool/preprocessor/_derive/amoc.py
@@ -1,7 +1,6 @@
 """Derivation of variable `amoc`."""
 import iris
 import numpy as np
-from iris import Constraint
 
 from ._baseclass import DerivedVariableBase
 
@@ -28,8 +27,8 @@ def calculate(cubes):
         """
         # 0. Load the msftmyz cube.
         cube = cubes.extract_strict(
-            Constraint(name='ocean_meridional_overturning_mass_'
-                       'streamfunction'))
+            iris.Constraint(
+                name='ocean_meridional_overturning_mass_streamfunction'))
 
         # 1: find the relevant region
         atlantic_region = 'atlantic_arctic_ocean'

diff --git a/esmvaltool/preprocessor/_derive/gtfgco2.py b/esmvaltool/preprocessor/_derive/gtfgco2.py
@@ -1,7 +1,6 @@
 """Derivation of variable `gtfgco2`."""
 import iris
 import numpy as np
-from iris import Constraint
 
 from ._baseclass import DerivedVariableBase
 
@@ -61,11 +60,11 @@ class DerivedVariable(DerivedVariableBase):
     def calculate(cubes):
         """Compute longwave cloud radiative effect."""
         fgco2_cube = cubes.extract_strict(
-            Constraint(name='surface_downward_mass_flux_of_carbon_dioxide'
-                       '_expressed_as_carbon'))
+            iris.Constraint(name='surface_downward_mass_flux_of_carbon_dioxide'
+                            '_expressed_as_carbon'))
 
         try:
-            cube_area = cubes.extract_strict(Constraint(name='cell_area'))
+            cube_area = cubes.extract_strict(iris.Constraint(name='cell_area'))
         except iris.exceptions.ConstraintMismatchError:
             pass
 

diff --git a/esmvaltool/preprocessor/_derive/toz.py b/esmvaltool/preprocessor/_derive/toz.py
@@ -4,7 +4,6 @@
 import iris
 import numba
 import numpy as np
-from iris import Constraint
 from scipy import constants
 
 from ._baseclass import DerivedVariableBase
@@ -45,8 +44,9 @@ def calculate(cubes):
 
         """
         tro3_cube = cubes.extract_strict(
-            Constraint(name='mole_fraction_of_ozone_in_air'))
-        ps_cube = cubes.extract_strict(Constraint(name='surface_air_pressure'))
+            iris.Constraint(name='mole_fraction_of_ozone_in_air'))
+        ps_cube = cubes.extract_strict(
+            iris.Constraint(name='surface_air_pressure'))
 
         p_layer_widths = _pressure_level_widths(
             tro3_cube, ps_cube, top_limit=0.0)