Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
fslpy
Commits
e6a4d1f8
Commit
e6a4d1f8
authored
6 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
RF: Avoid warnings
parent
a5d02f56
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
fsl/data/dicom.py
+6
-6
6 additions, 6 deletions
fsl/data/dicom.py
fsl/utils/idle.py
+2
-2
2 additions, 2 deletions
fsl/utils/idle.py
with
8 additions
and
8 deletions
fsl/data/dicom.py
+
6
−
6
View file @
e6a4d1f8
...
@@ -119,12 +119,12 @@ def enabled():
...
@@ -119,12 +119,12 @@ def enabled():
"""
"""
cmd
=
'
dcm2niix -h
'
cmd
=
'
dcm2niix -h
'
versionPattern
=
re
.
compile
(
'
v
'
versionPattern
=
re
.
compile
(
r
'
v
'
'
(?P<major>[0-9]+)\.
'
'
(?P<major>[0-9]+)\.
'
'
(?P<minor>[0-9]+)\.
'
'
(?P<minor>[0-9]+)\.
'
'
(?P<year>[0-9]{4})
'
'
(?P<year>[0-9]{4})
'
'
(?P<month>[0-9]{2})
'
'
(?P<month>[0-9]{2})
'
'
(?P<day>[0-9]{2})
'
)
'
(?P<day>[0-9]{2})
'
)
try
:
try
:
output
=
sp
.
check_output
(
cmd
.
split
()).
decode
()
output
=
sp
.
check_output
(
cmd
.
split
()).
decode
()
...
...
This diff is collapsed.
Click to expand it.
fsl/utils/idle.py
+
2
−
2
View file @
e6a4d1f8
...
@@ -85,7 +85,7 @@ import atexit
...
@@ -85,7 +85,7 @@ import atexit
import
logging
import
logging
import
functools
import
functools
import
threading
import
threading
import
collections
import
collections
.abc
as
abc
try
:
import
queue
try
:
import
queue
except
ImportError
:
import
Queue
as
queue
except
ImportError
:
import
Queue
as
queue
...
@@ -586,7 +586,7 @@ def wait(threads, task, *args, **kwargs):
...
@@ -586,7 +586,7 @@ def wait(threads, task, *args, **kwargs):
direct
=
kwargs
.
pop
(
'
wait_direct
'
,
False
)
direct
=
kwargs
.
pop
(
'
wait_direct
'
,
False
)
if
not
isinstance
(
threads
,
collections
.
Sequence
):
if
not
isinstance
(
threads
,
abc
.
Sequence
):
threads
=
[
threads
]
threads
=
[
threads
]
haveWX
=
fslplatform
.
haveGui
haveWX
=
fslplatform
.
haveGui
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment