fix: address review comments

Author: satra

nipype/utils/filemanip.py

@@ -685,37 +685,33 @@ def loadpkl(infile):
 
     unpkl = None
     with indirectory(infile.parent):
-        with SoftFileLock(infile.name + '.lock'):
-            pkl_file = pklopen(infile.name, 'rb')
-
-            try:  # Look if pkl file contains version file
-                pkl_metadata_line = pkl_file.readline()
-                pkl_metadata = json.loads(pkl_metadata_line)
-            except (UnicodeDecodeError, json.JSONDecodeError):
-                # Could not get version info
-                pkl_file.seek(0)
-
-            try:
-                unpkl = pickle.load(pkl_file)
-            except UnicodeDecodeError:
-                # Was this pickle created with Python 2.x?
-                unpkl = pickle.load(pkl_file, fix_imports=True, encoding='utf-8')
-                fmlogger.info('Successfully loaded pkl in compatibility mode.')
-            # Unpickling problems
-            except Exception as e:
-                if pkl_metadata and 'version' in pkl_metadata:
-                    from nipype import __version__ as version
-                    if pkl_metadata['version'] != version:
-                        fmlogger.error("""\
-    Attempted to open a results file generated by Nipype version %s, \
-    with an incompatible Nipype version (%s)""", pkl_metadata['version'], version)
-                        raise e
-                fmlogger.error("""\
-    No metadata was found in the pkl file. Make sure you are currently using \
-    the same Nipype version from the generated pkl.""")
-                raise e
-            finally:
-                pkl_file.close()
+        with SoftFileLock('%s.lock' % infile.name):
+            with pklopen(infile.name, 'rb') as pkl_file:
+                try:  # Look if pkl file contains version file
+                    pkl_metadata_line = pkl_file.readline()
+                    pkl_metadata = json.loads(pkl_metadata_line)
+                except (UnicodeDecodeError, json.JSONDecodeError):
+                    # Could not get version info
+                    pkl_file.seek(0)
+                try:
+                    unpkl = pickle.load(pkl_file)
+                except UnicodeDecodeError:
+                    # Was this pickle created with Python 2.x?
+                    unpkl = pickle.load(pkl_file, fix_imports=True, encoding='utf-8')
+                    fmlogger.info('Successfully loaded pkl in compatibility mode.')
+                # Unpickling problems
+                except Exception as e:
+                    if pkl_metadata and 'version' in pkl_metadata:
+                        from nipype import __version__ as version
+                        if pkl_metadata['version'] != version:
+                            fmlogger.error("""\
+Attempted to open a results file generated by Nipype version %s, \
+with an incompatible Nipype version (%s)""", pkl_metadata['version'], version)
+                            raise e
+                    fmlogger.error("""\
+No metadata was found in the pkl file. Make sure you are currently using \
+the same Nipype version from the generated pkl.""")
+                    raise e
 
     if unpkl is None:
         raise ValueError('Loading %s resulted in None.' % infile)
@@ -756,21 +752,17 @@ def read_stream(stream, logger=None, encoding=None):
 
 
 def savepkl(filename, record, versioning=False):
-    with SoftFileLock(filename + '.lock'):
-        if filename.endswith('pklz'):
-            pkl_file = gzip.open(filename, 'wb')
-        else:
-            pkl_file = open(filename, 'wb')
-
-        if versioning:
-            from nipype import __version__ as version
-            metadata = json.dumps({'version': version})
+    pklopen = gzip.open if filename.endswith('.pklz') else open
+    with SoftFileLock('%s.lock' % filename):
+        with pklopen(filename, 'wb') as pkl_file:
+            if versioning:
+                from nipype import __version__ as version
+                metadata = json.dumps({'version': version})
 
-            pkl_file.write(metadata.encode('utf-8'))
-            pkl_file.write('\n'.encode('utf-8'))
+                pkl_file.write(metadata.encode('utf-8'))
+                pkl_file.write('\n'.encode('utf-8'))
 
-        pickle.dump(record, pkl_file)
-        pkl_file.close()
+            pickle.dump(record, pkl_file)
 
 
 rst_levels = ['=', '-', '~', '+']