Skip to content

Commit 2a3ac5c

Browse files
committed
Merge pull request #371 from matthew-brett/fix-examples
MRG: fix a couple of examples Python 3 adding of ranges in one example. Stray text in another file causing a syntax error.
2 parents 53751ee + dc3c7ed commit 2a3ac5c

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

examples/ds105/parallel_run.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ def getruns():
4040
for j in range(1,13):
4141
yield i, j
4242

43-
ace_vs_scrambled_t/
44-
house_vs_scrambled_F/ house_vs_scrambled_t/
45-
object_bottle_0/ object_bottle_1/
46-
object_cat_0/ object_cat_1/
47-
object_chair_0/ object_chair_1/
48-
object_face_0/ object_face_1/
49-
object_house_0/ object_house_1/
50-
5143

5244
def getvals():
5345
for con in ['house_vs_scrambled_t',

examples/interfaces/process_ds105.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
management. nipype can handle vanilla SPM in MATLAB or SPM run through the
2121
MATLAB common runtime (free from MATLAB Licensing).
2222
'''
23+
from __future__ import print_function, division, absolute_import
24+
2325
import sys
2426
from copy import deepcopy
2527
from os.path import join as pjoin, abspath, splitext, isfile
@@ -45,7 +47,8 @@
4547
STUDY_DEF = dict(
4648
TR = 2.5,
4749
n_slices = N_SLICES,
48-
time_to_space = range(1, N_SLICES, 2) + range(2, N_SLICES, 2)
50+
time_to_space = (list(range(1, N_SLICES, 2)) +
51+
list(range(2, N_SLICES, 2)))
4952
)
5053

5154

0 commit comments

Comments
 (0)