BF: Making all existing unit tests happy

Author: pauldmccarthy

nibabel/arrayproxy.py

@@ -138,10 +138,20 @@ def __del__(self):
         '''If this ``ArrayProxy`` was created with ``keep_file_open=True``,
         the open file object is closed if necessary.
         '''
-        if self._keep_file_open and hasattr(self, '_opener'):
-            if not self._opener.closed:
-                self._opener.close()
-                self._opener = None
+        if hasattr(self, '_opener') and not self._opener.closed:
+            self._opener.close()
+            self._opener = None
+
+    def __getstate__(self):
+        '''Returns the state of this ``ArrayProxy`` during pickling. '''
+        state = self.__dict__.copy()
+        state.pop('_lock', None)
+        return state
+
+    def __setstate__(self, state):
+        '''Sets the state of this ``ArrayProxy`` during unpickling. '''
+        self.__dict__.update(state)
+        self._lock = Lock()
 
     @property
     @deprecate_with_version('ArrayProxy.header deprecated', '2.2', '3.0')

nibabel/fileslice.py

@@ -1,7 +1,6 @@
 """ Utilities for getting array slices out of file-like objects
 """
 from __future__ import division
-from contextlib import contextmanager
 
 import operator
 from numbers import Integral
@@ -648,10 +647,12 @@ def read_segments(fileobj, segments, n_bytes, lock=None):
     """
     # Make a dummy lock-like thing to make the code below a bit nicer
     if lock is None:
-        @contextmanager
-        def dummy_lock():
-            yield
-        lock = dummy_lock
+        class DummyLock(object):
+            def __enter__(self):
+                pass
+            def __exit__(self, exc_type, exc_val, exc_tb):
+                return False
+        lock = DummyLock()
 
     if len(segments) == 0:
         if n_bytes != 0:

nibabel/spm99analyze.py

@@ -245,8 +245,8 @@ class Spm99AnalyzeImage(analyze.AnalyzeImage):
 
     @classmethod
     @kw_only_meth(1)
-    def from_file_map(klass, file_map, mmap=True):
-        ''' class method to create image from mapping in `file_map ``
+    def from_file_map(klass, file_map, mmap=True, keep_file_open=False):
+        '''class method to create image from mapping in `file_map ``
 
         Parameters
         ----------
@@ -261,13 +261,19 @@ def from_file_map(klass, file_map, mmap=True):
             `mmap` value of True gives the same behavior as ``mmap='c'``.  If
             image data file cannot be memory-mapped, ignore `mmap` value and
             read array from file.
+        keep_file_open: If the file-ilke(s) is a file name, the default
+            behaviour is to open a new file handle every time the data is
+            accessed. If this flag is set to `True``, the file handle will be
+            opened on the first access, and kept open until this
+            ``ArrayProxy`` is garbage-collected.
 
         Returns
         -------
         img : Spm99AnalyzeImage instance
+
         '''
-        ret = super(Spm99AnalyzeImage, klass).from_file_map(file_map,
-                                                            mmap=mmap)
+        ret = super(Spm99AnalyzeImage, klass).from_file_map(
+            file_map, mmap=mmap, keep_file_open=keep_file_open)
         try:
             matf = file_map['mat'].get_prepare_fileobj()
         except IOError: