remove marshal to pickle

Author: oesteban

nipype/interfaces/dipy/preprocess.py

@@ -290,7 +290,7 @@ def nlmeans_proxy(in_file, settings,
 
     est_snr = True
     if snr is not None:
-        snr = [self.inputs.snr] * data.shape[-1]
+        snr = [snr] * data.shape[-1]
         est_snr = False
     else:
         snr = []

nipype/interfaces/dipy/reconstruction.py

@@ -316,8 +316,8 @@ class CSD(DipyBaseInterface):
     def _run_interface(self, runtime):
         from dipy.reconst.csdeconv import ConstrainedSphericalDeconvModel
         from dipy.data import get_sphere
-        import marshal as pickle
-        # import cPickle as pickle
+        # import marshal as pickle
+        import cPickle as pickle
         import gzip
 
         img = nb.load(self.inputs.in_file)

nipype/interfaces/dipy/tracks.py

@@ -153,8 +153,8 @@ def _run_interface(self, runtime):
         from dipy.reconst.peaks import peaks_from_model
         from dipy.tracking.eudx import EuDX
         from dipy.data import get_sphere
-        import marshal as pickle
-        # import cPickle as pickle
+        # import marshal as pickle
+        import cPickle as pickle
         import gzip
 
         if (not (isdefined(self.inputs.in_model) or