fixed hashing

Author: chrisgorgo

nipype/interfaces/tests/test_base.py

@@ -205,6 +205,20 @@ class spec2(nib.TraitedSpec):
     infields = spec2(moo=nme, doo=[tmp_infile])
     hashval = infields.get_hashval(hash_method='content')
     yield assert_equal, hashval[1], '642c326a05add933e9cdc333ce2d0ac2'
+    
+    class spec3(nib.TraitedSpec):
+        moo = nib.File(exists=True, name_source="doo")
+        doo = nib.traits.List(nib.File(exists=True))
+    infields = spec3(moo=nme, doo=[tmp_infile])
+    hashval1 = infields.get_hashval(hash_method='content')
+    
+    class spec4(nib.TraitedSpec):
+        moo = nib.File(exists=True)
+        doo = nib.traits.List(nib.File(exists=True))
+    infields = spec4(moo=nme, doo=[tmp_infile])
+    hashval2 = infields.get_hashval(hash_method='content')
+    
+    yield assert_not_equal, hashval1[1],  hashval2[1]
     os.chdir(pwd)
     teardown_file(tmpd)
 

nipype/interfaces/traits_extension.py

@@ -235,7 +235,7 @@ def has_metadata(trait, metadata, value=None, recursive=True):
     Checks if a given trait has a metadata (and optionally if it is set to particular value)
     '''
     count = 0
-    if hasattr(trait, metadata) and (getattr(trait, metadata) == value or value==None):
+    if metadata in trait._metadata.keys() and (trait._metadata[metadata] == value or value==None):
         count += 1
     if recursive:
         if hasattr(trait, 'inner_traits'):