Skip to content

Commit 2a811d4

Browse files
committed
protect replacement of imglob with __main__
1 parent 852e09a commit 2a811d4

File tree

2 files changed

+49
-55
lines changed

2 files changed

+49
-55
lines changed

.noserc

Lines changed: 0 additions & 11 deletions
This file was deleted.

nipype/external/fsl_imglob.py

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,8 @@
6565
# [email protected] quoting reference DE/9564.
6666
from __future__ import print_function
6767
import sys
68-
import os
6968
import glob
70-
71-
setAvailable = True
72-
if sys.version_info < (2, 4):
73-
import sets
74-
from sets import Set
75-
setAvailable = False
76-
69+
from builtins import range
7770

7871
def usage():
7972
print("Usage: $0 [-extension/extensions] <list of names>")
@@ -94,45 +87,57 @@ def isImage(input, allExtensions):
9487
def removeImageExtension(input, allExtensions):
9588
return isImage(input, allExtensions)[1]
9689

97-
if len(sys.argv) <= 1:
98-
usage()
9990

100-
deleteExtensions = True
101-
primaryExtensions = ['.nii.gz', '.nii', '.hdr.gz', '.hdr']
102-
secondaryExtensions = ['.img.gz', '.img']
103-
allExtensions = primaryExtensions+secondaryExtensions
104-
validExtensions = primaryExtensions
105-
startingArg = 1
91+
def main():
92+
if len(sys.argv) <= 1:
93+
usage()
94+
95+
if sys.version_info < (2, 4):
96+
import sets
97+
from sets import Set
98+
setAvailable = False
99+
else:
100+
setAvailable = True
101+
102+
deleteExtensions = True
103+
primaryExtensions = ['.nii.gz', '.nii', '.hdr.gz', '.hdr']
104+
secondaryExtensions = ['.img.gz', '.img']
105+
allExtensions = primaryExtensions+secondaryExtensions
106+
validExtensions = primaryExtensions
107+
startingArg = 1
108+
109+
if sys.argv[1] == "-extensions":
110+
validExtensions = allExtensions
111+
deleteExtensions = False
112+
startingArg = 2
113+
if sys.argv[1] == "-extension":
114+
deleteExtensions = False
115+
startingArg = 2
106116

107-
if sys.argv[1] == "-extensions":
108-
validExtensions = allExtensions
109-
deleteExtensions = False
110-
startingArg = 2
111-
if sys.argv[1] == "-extension":
112-
deleteExtensions = False
113-
startingArg = 2
117+
filelist = []
118+
for arg in range(startingArg, len(sys.argv)):
119+
# if isImage(sys.argv[arg],allExtensions)[0]: #These enable a "pedantic" style mode currently not used
120+
# filelist.extend(glob.glob(sys.argv[arg]))
121+
# else:
122+
# for currentExtension in validExtensions:
123+
# filelist.extend(glob.glob(sys.argv[arg]+currentExtension))
124+
for currentExtension in validExtensions:
125+
filelist.extend(
126+
glob.glob(removeImageExtension(sys.argv[arg], allExtensions)+currentExtension))
114127

115-
filelist = []
116-
for arg in range(startingArg, len(sys.argv)):
117-
# if isImage(sys.argv[arg],allExtensions)[0]: #These enable a "pedantic" style mode currently not used
118-
# filelist.extend(glob.glob(sys.argv[arg]))
119-
# else:
120-
# for currentExtension in validExtensions:
121-
# filelist.extend(glob.glob(sys.argv[arg]+currentExtension))
122-
for currentExtension in validExtensions:
123-
filelist.extend(
124-
glob.glob(removeImageExtension(sys.argv[arg], allExtensions)+currentExtension))
128+
if deleteExtensions:
129+
for file in range(0, len(filelist)):
130+
filelist[file] = removeImageExtension(filelist[file], allExtensions)
131+
if setAvailable:
132+
filelist = list(set(filelist))
133+
else:
134+
filelist = list(Set(filelist))
135+
filelist.sort()
125136

126-
if deleteExtensions:
127137
for file in range(0, len(filelist)):
128-
filelist[file] = removeImageExtension(filelist[file], allExtensions)
129-
if setAvailable:
130-
filelist = list(set(filelist))
131-
else:
132-
filelist = list(Set(filelist))
133-
filelist.sort()
138+
print(filelist[file], end=' ')
139+
if file < len(filelist)-1:
140+
print(" ", end=' ')
134141

135-
for file in range(0, len(filelist)):
136-
print(filelist[file], end=' ')
137-
if file < len(filelist)-1:
138-
print(" ", end=' ')
142+
if __name__ == "__main__":
143+
main()

0 commit comments

Comments
 (0)