Skip to content

Commit 0ab2856

Browse files
committed
STY: isort
[git-blame-ignore-rev]
1 parent 5d0481d commit 0ab2856

File tree

171 files changed

+874
-971
lines changed

Some content is hidden

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

171 files changed

+874
-971
lines changed

nibabel/__init__.py

Lines changed: 19 additions & 21 deletions
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,39 +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
46-
from . import mriutils
47-
from . import streamlines
48-
from . import viewers
44+
from . import spm2analyze as spm2
45+
from . import spm99analyze as spm99
46+
from . import streamlines, viewers
4947

5048
# isort: split
5149

5250
# object imports
51+
from .analyze import AnalyzeHeader, AnalyzeImage
52+
from .arrayproxy import is_proxy
53+
from .cifti2 import Cifti2Header, Cifti2Image
5354
from .fileholders import FileHolder, FileHolderError
55+
from .freesurfer import MGHImage
56+
from .funcs import as_closest_canonical, concat_images, four_to_three, squeeze_image
57+
from .gifti import GiftiImage
58+
from .imageclasses import all_image_classes
5459
from .loadsave import load, save
55-
from .arrayproxy import is_proxy
56-
from .analyze import AnalyzeHeader, AnalyzeImage
57-
from .spm99analyze import Spm99AnalyzeHeader, Spm99AnalyzeImage
58-
from .spm2analyze import Spm2AnalyzeHeader, Spm2AnalyzeImage
59-
from .nifti1 import Nifti1Header, Nifti1Image, Nifti1Pair
60-
from .nifti2 import Nifti2Header, Nifti2Image, Nifti2Pair
6160
from .minc1 import Minc1Image
6261
from .minc2 import Minc2Image
63-
from .cifti2 import Cifti2Header, Cifti2Image
64-
from .gifti import GiftiImage
65-
from .freesurfer import MGHImage
66-
from .funcs import squeeze_image, concat_images, four_to_three, as_closest_canonical
62+
from .nifti1 import Nifti1Header, Nifti1Image, Nifti1Pair
63+
from .nifti2 import Nifti2Header, Nifti2Image, Nifti2Pair
6764
from .orientations import (
68-
io_orientation,
69-
flip_axis,
7065
OrientationError,
71-
apply_orientation,
7266
aff2axcodes,
67+
apply_orientation,
68+
flip_axis,
69+
io_orientation,
7370
)
74-
from .imageclasses import all_image_classes
71+
from .spm2analyze import Spm2AnalyzeHeader, Spm2AnalyzeImage
72+
from .spm99analyze import Spm99AnalyzeHeader, Spm99AnalyzeImage
7573

7674
# isort: split
7775

nibabel/affines.py

Lines changed: 2 additions & 2 deletions
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

Lines changed: 10 additions & 10 deletions
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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@
2525
2626
See :mod:`nibabel.tests.test_proxy_api` for proxy API conformance checks.
2727
"""
28+
import warnings
2829
from contextlib import contextmanager
2930
from threading import RLock
30-
import warnings
3131

3232
import numpy as np
3333

34-
from .volumeutils import array_from_file, apply_read_scaling
35-
from .fileslice import fileslice, canonical_slicers
3634
from . import openers
37-
35+
from .fileslice import canonical_slicers, fileslice
36+
from .volumeutils import apply_read_scaling, array_from_file
3837

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

415414
# Calculate new shape if not fully specified
416-
from operator import mul
417415
from functools import reduce
416+
from operator import mul
418417

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

nibabel/arraywriters.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ 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
43+
from .volumeutils import array_to_file, finite_range
4444

4545

4646
class WriterError(Exception):

nibabel/benchmarks/bench_array_to_file.py

Lines changed: 2 additions & 3 deletions
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

Lines changed: 5 additions & 4 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 4 deletions
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

Lines changed: 2 additions & 5 deletions
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)

0 commit comments

Comments
 (0)