Pass hashmethod to associated copyfiles, PEP8 cleanup

Author: effigies

nipype/utils/filemanip.py

@@ -20,7 +20,6 @@
 import numpy as np
 
 from .misc import is_container
-from .config import mkdir_p
 from ..external.six import string_types
 from ..interfaces.traits_extension import isdefined
 
@@ -246,10 +245,10 @@ def copyfile(originalfile, newfile, copy=False, create_new=False,
             elif hashmethod == 'content':
                 hashfn = hash_infile
             newhash = hashfn(newfile)
-            fmlogger.debug("File: %s already exists,%s, copy:%d"
-                   % (newfile, newhash, copy))
+            fmlogger.debug("File: %s already exists,%s, copy:%d" %
+                           (newfile, newhash, copy))
             orighash = hashfn(originalfile)
-            keep = hashfn(newfile) == hashfn(originalfile)
+            keep = newhash == orighash
         if keep:
             fmlogger.debug("File: %s already exists, not overwriting, copy:%d"
                            % (newfile, copy))
@@ -267,7 +266,7 @@ def copyfile(originalfile, newfile, copy=False, create_new=False,
             # Use realpath to avoid hardlinking symlinks
             os.link(os.path.realpath(originalfile), newfile)
         except OSError:
-            use_hardlink=False  # Disable for associated files
+            use_hardlink = False  # Disable hardlink for associated files
         else:
             keep = True
 
@@ -276,7 +275,7 @@ def copyfile(originalfile, newfile, copy=False, create_new=False,
             fmlogger.debug("Symlinking File: %s->%s" % (newfile, originalfile))
             os.symlink(originalfile, newfile)
         except OSError:
-            copy = True  # Disable for associated files
+            copy = True  # Disable symlink for associated files
         else:
             keep = True
 
@@ -294,12 +293,15 @@ def copyfile(originalfile, newfile, copy=False, create_new=False,
         matofile = originalfile[:-4] + ".mat"
         if os.path.exists(matofile):
             matnfile = newfile[:-4] + ".mat"
-            copyfile(matofile, matnfile, copy, use_hardlink=use_hardlink)
-        copyfile(hdrofile, hdrnfile, copy, use_hardlink=use_hardlink)
+            copyfile(matofile, matnfile, copy, hashmethod=hashmethod,
+                     use_hardlink=use_hardlink)
+        copyfile(hdrofile, hdrnfile, copy, hashmethod=hashmethod,
+                 use_hardlink=use_hardlink)
     elif originalfile.endswith(".BRIK"):
         hdrofile = originalfile[:-5] + ".HEAD"
         hdrnfile = newfile[:-5] + ".HEAD"
-        copyfile(hdrofile, hdrnfile, copy, use_hardlink=use_hardlink)
+        copyfile(hdrofile, hdrnfile, copy, hashmethod=hashmethod,
+                 use_hardlink=use_hardlink)
 
     return newfile