Merge pull request #461 from satra/fix/removetraitschanges

Fix/removetraitschanges

Author: chrisgorgo

nipype/interfaces/base.py

@@ -499,17 +499,6 @@ def _get_sorteddict(self, object, dictwithhash=False, hash_method=None, hash_fil
                     out = object
         return out
 
-    def __getstate__(self):
-        state = super(BaseTraitedSpec, self).__getstate__()
-        inst_traits = self._instance_traits()
-        state['__instance_traits__'] = inst_traits
-        return state
-
-    def __setstate__(self, state):
-        inst_traits = state.pop('__instance_traits__', {})
-        for attr, trait in inst_traits.iteritems():
-            self.add_trait(attr, trait)
-        super(BaseTraitedSpec, self).__setstate__(state)
 
 class DynamicTraitedSpec(BaseTraitedSpec):
     """ A subclass to handle dynamic traits
@@ -524,12 +513,22 @@ def __deepcopy__(self, memo):
         id_self = id(self)
         if id_self in memo:
             return memo[id_self]
-        dup_dict = deepcopy(self.__getstate__(), memo)
+        dup_dict = deepcopy(self.get(), memo)
+        # access all keys
+        for key in self.copyable_trait_names():
+            _ = getattr(self, key)
+        # clone once
         dup = self.clone_traits(memo=memo)
-        dup.__setstate__(dup_dict)
+        for key in self.copyable_trait_names():
+            try:
+                _ = getattr(dup, key)
+            except:
+                pass
+        # clone twice
+        dup = self.clone_traits(memo=memo)
+        dup.set(**dup_dict)
         return dup
 
-
 class TraitedSpec(BaseTraitedSpec):
     """ Create a subclass with strict traits.
 

nipype/interfaces/tests/test_base.py

@@ -91,7 +91,7 @@ class spec(nib.TraitedSpec):
     #yield assert_equal, infields.hashval[1], hashval[1]
     yield assert_equal, infields.__repr__(), '\nfoo = 1\ngoo = 0.0\n'
 
-def test_TraitedSpec_pickle():
+def test_TraitedSpec_dynamic():
     from cPickle import dumps, loads
     a = nib.BaseTraitedSpec()
     a.add_trait('foo', nib.traits.Int)
@@ -103,17 +103,6 @@ def test_TraitedSpec_pickle():
     assign_a_again = lambda : setattr(unpkld_a, 'foo', 'a')
     yield assert_raises, Exception, assign_a_again
 
-def test_TraitedSpec_deepcopy():
-    from copy import deepcopy
-    a = nib.DynamicTraitedSpec()
-    a.add_trait('foo', nib.traits.Int)
-    a.foo = 1
-    assign_a = lambda : setattr(a, 'foo', 'a')
-    yield assert_raises, Exception, assign_a
-    unpkld_a = deepcopy(a)
-    assign_a_again = lambda : setattr(unpkld_a, 'foo', 'a')
-    yield assert_raises, Exception, assign_a_again
-
 def test_TraitedSpec_logic():
     class spec3(nib.TraitedSpec):
         _xor_inputs = ('foo', 'bar')