Change idioms for selecting the 2nd output arg.

Author: Ben Cipollini

nibabel/imageclasses.py

@@ -16,7 +16,7 @@
 from .parrec import PARRECImage
 from .volumeutils import Recoder
 from .optpkg import optional_package
-have_scipy = optional_package('scipy')[1]
+_, have_scipy, _ = optional_package('scipy')
 
 
 # mapping of names to classes and class functionality

nibabel/tests/data/check_parrec_reslice.py

@@ -29,7 +29,7 @@
 from nibabel import parrec
 from nibabel.affines import to_matvec
 from nibabel.optpkg import optional_package
-have_scipy = optional_package('scipy')[1]
+_, have_scipy, _ = optional_package('scipy')
 
 
 def resample_img2img(img_to, img_from, order=1, out_class=nib.Nifti1Image):

nibabel/tests/test_helpers.py

@@ -9,7 +9,7 @@
 from ..openers import Opener
 from ..optpkg import optional_package
 from ..tmpdirs import InTemporaryDirectory
-have_scipy = optional_package('scipy')[1]
+_, have_scipy, _ = optional_package('scipy')
 
 
 def bytesio_filemap(klass):

nibabel/tests/test_image_api.py

@@ -28,8 +28,8 @@
 import numpy as np
 
 from ..optpkg import optional_package
-have_scipy = optional_package('scipy')[1]
-have_h5py = optional_package('h5py')[1]
+_, have_scipy, _ = optional_package('scipy')
+_, have_h5py, _ = optional_package('h5py')
 
 from .. import (AnalyzeImage, Spm99AnalyzeImage, Spm2AnalyzeImage,
                 Nifti1Pair, Nifti1Image, Nifti2Pair, Nifti2Image,

nibabel/tests/test_image_load_save.py

@@ -17,7 +17,7 @@
 
 # If we don't have scipy, then we cannot write SPM format files
 from ..optpkg import optional_package
-have_scipy = optional_package('scipy')[1]
+_, have_scipy, _ = optional_package('scipy')
 
 from .. import analyze as ana
 from .. import spm99analyze as spm99

nibabel/tests/test_loadsave.py

@@ -15,7 +15,7 @@
 from ..tmpdirs import InTemporaryDirectory, TemporaryDirectory
 
 from ..optpkg import optional_package
-have_scipy = optional_package('scipy')[1]
+_, have_scipy, _ = optional_package('scipy')
 
 from numpy.testing import (assert_almost_equal,
                            assert_array_equal)

nibabel/tests/test_spm99analyze.py

@@ -17,7 +17,7 @@
 # Decorator to skip tests requiring save / load if scipy not available for mat
 # files
 from ..optpkg import optional_package
-have_scipy = optional_package('scipy')[1]
+_, have_scipy, _ = optional_package('scipy')
 scipy_skip = dec.skipif(not have_scipy, 'scipy not available')
 
 from ..spm99analyze import (Spm99AnalyzeHeader, Spm99AnalyzeImage,