Skip to content

Commit 7572472

Browse files
committed
STY: isort
[git-blame-ignore-rev]
1 parent 9911244 commit 7572472

File tree

175 files changed

+900
-1003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+900
-1003
lines changed

nibabel/__init__.py

+20-23
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
import os
1111

12-
from .pkg_info import __version__
1312
from .info import long_description as __doc__
13+
from .pkg_info import __version__
1414

1515
__doc__ += """
1616
Quickstart
@@ -39,40 +39,37 @@
3939

4040
# module imports
4141
from . import analyze as ana
42-
from . import spm99analyze as spm99
43-
from . import spm2analyze as spm2
42+
from . import ecat, mriutils
4443
from . import nifti1 as ni1
45-
from . import ecat
44+
from . import spm2analyze as spm2
45+
from . import spm99analyze as spm99
46+
from . import streamlines, viewers
47+
from .analyze import AnalyzeHeader, AnalyzeImage
48+
from .arrayproxy import is_proxy
49+
from .cifti2 import Cifti2Header, Cifti2Image
4650

4751
# object imports
4852
from .fileholders import FileHolder, FileHolderError
53+
from .freesurfer import MGHImage
54+
from .funcs import as_closest_canonical, concat_images, four_to_three, squeeze_image
55+
from .gifti import GiftiImage
56+
from .imageclasses import all_image_classes, class_map, ext_map
4957
from .loadsave import load, save
50-
from .arrayproxy import is_proxy
51-
from .analyze import AnalyzeHeader, AnalyzeImage
52-
from .spm99analyze import Spm99AnalyzeHeader, Spm99AnalyzeImage
53-
from .spm2analyze import Spm2AnalyzeHeader, Spm2AnalyzeImage
54-
from .nifti1 import Nifti1Header, Nifti1Image, Nifti1Pair
55-
from .nifti2 import Nifti2Header, Nifti2Image, Nifti2Pair
5658
from .minc1 import Minc1Image
5759
from .minc2 import Minc2Image
58-
from .cifti2 import Cifti2Header, Cifti2Image
59-
from .gifti import GiftiImage
60-
from .freesurfer import MGHImage
61-
from .funcs import squeeze_image, concat_images, four_to_three, as_closest_canonical
60+
from .nifti1 import Nifti1Header, Nifti1Image, Nifti1Pair
61+
from .nifti2 import Nifti2Header, Nifti2Image, Nifti2Pair
6262
from .orientations import (
63-
io_orientation,
64-
orientation_affine,
65-
flip_axis,
6663
OrientationError,
67-
apply_orientation,
6864
aff2axcodes,
65+
apply_orientation,
66+
flip_axis,
67+
io_orientation,
68+
orientation_affine,
6969
)
70-
from .imageclasses import class_map, ext_map, all_image_classes
71-
from . import mriutils
72-
from . import streamlines
73-
from . import viewers
74-
7570
from .pkg_info import get_pkg_info as _get_pkg_info
71+
from .spm2analyze import Spm2AnalyzeHeader, Spm2AnalyzeImage
72+
from .spm99analyze import Spm99AnalyzeHeader, Spm99AnalyzeImage
7673

7774

7875
def get_info():

nibabel/affines.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# vi: set ft=python sts=4 ts=4 sw=4 et:
33
"""Utility routines for working with points and affine transforms
44
"""
5-
import numpy as np
6-
75
from functools import reduce
86

7+
import numpy as np
8+
99

1010
class AffineError(ValueError):
1111
"""Errors in calculating or using affines"""

nibabel/analyze.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@
8484

8585
import numpy as np
8686

87+
from .arrayproxy import ArrayProxy
88+
from .arraywriters import ArrayWriter, WriterError, get_slope_inter, make_array_writer
89+
from .batteryrunners import Report
90+
from .fileholders import copy_file_map
91+
from .spatialimages import HeaderDataError, HeaderTypeError, SpatialImage
8792
from .volumeutils import (
88-
native_code,
89-
swapped_code,
90-
make_dt_codes,
91-
shape_zoom_affine,
93+
apply_read_scaling,
9294
array_from_file,
95+
make_dt_codes,
96+
native_code,
9397
seek_tell,
94-
apply_read_scaling,
98+
shape_zoom_affine,
99+
swapped_code,
95100
)
96-
from .arraywriters import make_array_writer, get_slope_inter, WriterError, ArrayWriter
97101
from .wrapstruct import LabeledWrapStruct
98-
from .spatialimages import HeaderDataError, HeaderTypeError, SpatialImage
99-
from .fileholders import copy_file_map
100-
from .batteryrunners import Report
101-
from .arrayproxy import ArrayProxy
102102

103103
# Sub-parts of standard analyze header from
104104
# Mayo dbh.h file

nibabel/arrayproxy.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@
3030

3131
import numpy as np
3232

33-
from .volumeutils import array_from_file, apply_read_scaling
34-
from .fileslice import fileslice, canonical_slicers
3533
from . import openers
36-
34+
from .fileslice import canonical_slicers, fileslice
35+
from .volumeutils import apply_read_scaling, array_from_file
3736

3837
"""This flag controls whether a new file handle is created every time an image
3938
is accessed through an ``ArrayProxy``, or a single file handle is created and
@@ -389,8 +388,8 @@ def reshape(self, shape):
389388
size = np.prod(self._shape)
390389

391390
# Calculate new shape if not fully specified
392-
from operator import mul
393391
from functools import reduce
392+
from operator import mul
394393

395394
n_unknowns = len([e for e in shape if e == -1])
396395
if n_unknowns > 1:

nibabel/arraywriters.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ def __init__(self, array, out_dtype=None)
3232
import numpy as np
3333

3434
from .casting import (
35-
int_to_float,
3635
as_int,
37-
int_abs,
38-
type_info,
39-
floor_exact,
4036
best_float,
37+
floor_exact,
38+
int_abs,
39+
int_to_float,
4140
shared_range,
41+
type_info,
4242
)
43-
from .volumeutils import finite_range, array_to_file
4443
from .deprecator import ExpiredDeprecationError
44+
from .volumeutils import array_to_file, finite_range
4545

4646

4747
class WriterError(Exception):

nibabel/benchmarks/bench_array_to_file.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
from io import BytesIO # NOQA
1515

1616
import numpy as np
17-
18-
from .butils import print_git_title
19-
2017
from numpy.testing import measure
2118

2219
from nibabel.volumeutils import array_to_file # NOQA
2320

21+
from .butils import print_git_title
22+
2423

2524
def bench_array_to_file():
2625
rng = np.random.RandomState(20111001)

nibabel/benchmarks/bench_arrayproxy_slicing.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@
1010
pytest -c <path>/benchmarks/pytest.benchmark.ini <path>/benchmarks/bench_arrayproxy_slicing.py
1111
"""
1212

13-
from timeit import timeit
1413
import gc
1514
import itertools as it
16-
import numpy as np
15+
from timeit import timeit
1716
from unittest import mock
1817

18+
import numpy as np
19+
1920
import nibabel as nib
20-
from nibabel.tmpdirs import InTemporaryDirectory
2121
from nibabel.openers import HAVE_INDEXED_GZIP
22+
from nibabel.tmpdirs import InTemporaryDirectory
2223

23-
from .butils import print_git_title
2424
from ..rstutils import rst_table
25+
from .butils import print_git_title
2526

2627
# if memory_profiler is installed, we get memory usage results
2728
try:

nibabel/benchmarks/bench_fileslice.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
"""
1010

1111
import sys
12+
from io import BytesIO
1213
from timeit import timeit
1314

1415
import numpy as np
1516

16-
from io import BytesIO
17-
from ..openers import ImageOpener
1817
from ..fileslice import fileslice
18+
from ..openers import ImageOpener
19+
from ..optpkg import optional_package
1920
from ..rstutils import rst_table
2021
from ..tmpdirs import InTemporaryDirectory
21-
from ..optpkg import optional_package
2222

2323
SHAPE = (64, 64, 32, 100)
2424
ROW_NAMES = [f'axis {i}, len {dim}' for i, dim in enumerate(SHAPE)]

nibabel/benchmarks/bench_finite_range.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
import sys
1414

1515
import numpy as np
16-
17-
18-
from .butils import print_git_title
19-
2016
from numpy.testing import measure
2117

2218
from nibabel.volumeutils import finite_range # NOQA
2319

20+
from .butils import print_git_title
21+
2422

2523
def bench_finite_range():
2624
rng = np.random.RandomState(20111001)

nibabel/benchmarks/bench_load_save.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@
1111
"""
1212

1313
import sys
14+
from io import BytesIO
1415

1516
import numpy as np
16-
17-
from io import BytesIO
17+
from numpy.testing import measure
1818

1919
from .. import Nifti1Image
20-
2120
from .butils import print_git_title
2221

23-
from numpy.testing import measure
24-
2522

2623
def bench_load_save():
2724
rng = np.random.RandomState(20111001)

nibabel/brikhead.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
programs (e.g., example4d+orig'[0]').
2929
"""
3030

31-
from copy import deepcopy
3231
import os
3332
import re
33+
from copy import deepcopy
3434

3535
import numpy as np
3636

3737
from .arrayproxy import ArrayProxy
3838
from .fileslice import strided_scalar
39-
from .spatialimages import SpatialImage, SpatialHeader, HeaderDataError, ImageDataError
39+
from .spatialimages import HeaderDataError, ImageDataError, SpatialHeader, SpatialImage
4040
from .volumeutils import Recoder
4141

4242
# used for doc-tests

nibabel/casting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import warnings
88
from numbers import Integral
9-
from platform import processor, machine
9+
from platform import machine, processor
1010

1111
import numpy as np
1212

nibabel/cifti2/__init__.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
cifti2_axes
1818
"""
1919

20-
from .parse_cifti2 import Cifti2Extension
2120
from .cifti2 import (
22-
Cifti2MetaData,
21+
CIFTI_BRAIN_STRUCTURES,
22+
CIFTI_MODEL_TYPES,
23+
Cifti2BrainModel,
2324
Cifti2Header,
25+
Cifti2HeaderError,
2426
Cifti2Image,
2527
Cifti2Label,
2628
Cifti2LabelTable,
27-
Cifti2VertexIndices,
28-
Cifti2VoxelIndicesIJK,
29-
Cifti2BrainModel,
3029
Cifti2Matrix,
3130
Cifti2MatrixIndicesMap,
31+
Cifti2MetaData,
3232
Cifti2NamedMap,
3333
Cifti2Parcel,
3434
Cifti2Surface,
3535
Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ,
36+
Cifti2VertexIndices,
3637
Cifti2Vertices,
3738
Cifti2Volume,
38-
CIFTI_BRAIN_STRUCTURES,
39-
Cifti2HeaderError,
40-
CIFTI_MODEL_TYPES,
39+
Cifti2VoxelIndicesIJK,
4140
load,
4241
save,
4342
)
44-
from .cifti2_axes import Axis, BrainModelAxis, ParcelsAxis, SeriesAxis, LabelAxis, ScalarAxis
43+
from .cifti2_axes import Axis, BrainModelAxis, LabelAxis, ParcelsAxis, ScalarAxis, SeriesAxis
44+
from .parse_cifti2 import Cifti2Extension

nibabel/cifti2/cifti2.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
http://www.nitrc.org/projects/cifti
1818
"""
1919
import re
20-
from collections.abc import MutableSequence, MutableMapping, Iterable
2120
from collections import OrderedDict
21+
from collections.abc import Iterable, MutableMapping, MutableSequence
2222
from warnings import warn
2323

2424
import numpy as np
2525

2626
from .. import xmlutils as xml
27-
from ..filebasedimages import FileBasedHeader, SerializableImage
28-
from ..dataobj_images import DataobjImage
29-
from ..nifti1 import Nifti1Extensions
30-
from ..nifti2 import Nifti2Image, Nifti2Header
3127
from ..arrayproxy import reshape_dataobj
3228
from ..caret import CaretMetaData
29+
from ..dataobj_images import DataobjImage
30+
from ..filebasedimages import FileBasedHeader, SerializableImage
31+
from ..nifti1 import Nifti1Extensions
32+
from ..nifti2 import Nifti2Header, Nifti2Image
3333
from ..volumeutils import make_dt_codes
3434

3535

@@ -1473,7 +1473,7 @@ def from_file_map(klass, file_map, *, mmap=True, keep_file_open=None):
14731473
img : Cifti2Image
14741474
Returns a Cifti2Image
14751475
"""
1476-
from .parse_cifti2 import _Cifti2AsNiftiImage, Cifti2Extension
1476+
from .parse_cifti2 import Cifti2Extension, _Cifti2AsNiftiImage
14771477

14781478
nifti_img = _Cifti2AsNiftiImage.from_file_map(
14791479
file_map, mmap=mmap, keep_file_open=keep_file_open

nibabel/cifti2/cifti2_axes.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@
118118
... bm_cortex)))
119119
<class 'nibabel.cifti2.cifti2.Cifti2Header'>
120120
"""
121+
import abc
122+
from operator import xor
123+
121124
import numpy as np
125+
122126
from . import cifti2
123-
from operator import xor
124-
import abc
125127

126128

127129
def from_index_mapping(mim):

0 commit comments

Comments
 (0)