undo accidental changes in merge

Author: Shoshana Berleant

Makefile

@@ -53,10 +53,7 @@ inplace:
 	$(PYTHON) setup.py build_ext -i
 
 test-code: in
-#	$(NOSETESTS) -s nipype/algorithms/compcor.py --with-doctest -v
-	$(NOSETESTS) -s nipype/algorithms/tests/test_tsnr.py #--with-coverage
-	$(NOSETESTS) -s nipype/algorithms/tests/test_compcor.py #--with-coverage
-#	$(NOSETESTS) -s nipype/algorithms/misc.py --with-doctest -v
+	$(NOSETESTS) -s nipype --with-doctest
 
 test-doc:
 	$(NOSETESTS) -s --with-doctest --doctest-tests --doctest-extension=rst \

nipype/algorithms/tsnr.py

@@ -60,11 +60,8 @@ def _run_interface(self, runtime):
         img = nb.load(self.inputs.in_file[0])
         header = img.header.copy()
         vollist = [nb.load(filename) for filename in self.inputs.in_file]
-        data = np.concatenate(
-            [vol.get_data().reshape(
-                vol.get_shape()[:3] + (-1,))
-             for vol in vollist],
-                              axis=3)
+        data = np.concatenate([vol.get_data().reshape(
+            vol.get_shape()[:3] + (-1,)) for vol in vollist], axis=3)
         data = np.nan_to_num(data)
 
         if data.dtype.kind == 'i':