Merge back v1.10.x

lib/iris/__init__.py

@@ -122,7 +122,7 @@ def callback(cube, field, filename):
 
 
 # Iris revision.
-__version__ = '1.10.0'
+__version__ = '1.11.0-DEV'
 
 # Restrict the names imported when using "from iris import *"
 __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',

lib/iris/fileformats/pp.py

@@ -2442,8 +2442,8 @@ def as_fields(cube, field_coords=None, target=None):
         A filename or open file handle.
 
     """
-    return (field for cube, field in as_pairs(cube, field_coords=field_coords,
-                                              target=target))
+    return (field for cube, field in save_pairs_from_cube(
+        cube, field_coords=field_coords, target=target))
 
 
 def save_fields(fields, target, append=False):

lib/iris/tests/test_whatsnew_contributions.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2010 - 2015, Met Office
+# (C) British Crown Copyright 2010 - 2016, Met Office
 #
 # This file is part of Iris.
 #
@@ -39,6 +39,7 @@
 import os
 import os.path
 import subprocess
+import sys
 
 import iris
 
@@ -61,8 +62,9 @@ def test_check_contributions(self):
         # Travis bypasses this problem by running the test directly.
         if os.path.exists(whatsnew_dirpath):
             # Run a 'check contributions' command in that directory.
-            cmd = 'python aggregate_directory.py --checkonly --quiet'
-            subprocess.check_call(cmd, cwd=whatsnew_dirpath, shell=True)
+            cmd = [sys.executable, 'aggregate_directory.py', '--checkonly',
+                   '--quiet']
+            subprocess.check_call(cmd, cwd=whatsnew_dirpath)
 
 
 if __name__ == "__main__":