Skip to content

Commit

Permalink
STYLE: Prefer absolute imports
Browse files Browse the repository at this point in the history
Prefer absoulute import statements: Python PEP 8 recomends using
absolute imports:
https://peps.python.org/pep-0008/#imports

"Absolute imports are recommended, as they are usually more readable and
tend to be better behaved (or at least give better error messages)
(...)."
  • Loading branch information
jhlegarreta committed Dec 11, 2024
1 parent 674d9d5 commit a921454
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 38 deletions.
8 changes: 4 additions & 4 deletions tract_querier/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os
import sysconfig

from .query_processor import *
from .tract_label_indices import *
from .shell import *
from . import tractography
from tract_querier.query_processor import *
from tract_querier.tract_label_indices import *
from tract_querier.shell import *
from tract_querier import tractography


def find_queries_path():
Expand Down
4 changes: 2 additions & 2 deletions tract_querier/nipype/wmql.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class TractQuerier(CommandLine):
Examples
--------
>>> from ..nipype.wmql import TractQuerier
>>> from tract_querier.nipype.wmql import TractQuerier
>>> import os
>>> tract_querier = TractQuerier()
>>> tract_querier.inputs.atlas_type = 'Desikan'
Expand Down Expand Up @@ -85,7 +85,7 @@ class MapImageToTracts(CommandLine):
Examples
--------
>>> from ..nipype.wmql import MapImageToTracts
>>> from tract_querier.nipype.wmql import MapImageToTracts
>>> tract_mapper = MapImageToTracts()
>>> tract_mapper.inputs.output_tractography_prefix = 'out_'
>>> tract_mapper.inputs.input_image = 'fa.nii.gz'
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/query_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from itertools import takewhile
import fnmatch

from .code_util import DocStringInheritor
from tract_querier.code_util import DocStringInheritor


__all__ = [
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/shell.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ast
import cmd
import fnmatch
from .query_processor import (
from tract_querier.query_processor import (
EvaluateQueries, queries_preprocess,
TractQuerierSyntaxError, TractQuerierLabelNotFound,
keywords
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tensor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

__all__ = ['scalar_measures']

from . import scalar_measures
from tract_querier.tensor import scalar_measures
2 changes: 1 addition & 1 deletion tract_querier/tensor/tests/test_scalar_measures.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .. import scalar_measures
from tract_querier.tensor import scalar_measures

import numpy
from numpy.testing import assert_array_almost_equal
Expand Down
4 changes: 2 additions & 2 deletions tract_querier/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from . import test_query_eval
from . import test_query_files
from tract_querier.tests import test_query_eval
from tract_querier.tests import test_query_files
2 changes: 1 addition & 1 deletion tract_querier/tests/test_query_eval.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .. import query_processor
from tract_querier import query_processor

import ast
import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tests/test_query_files.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .. import queries_preprocess, queries_syntax_check
from tract_querier.query_processor import queries_preprocess, queries_syntax_check

import os
import fnmatch
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tests/test_query_rewrite.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .. import query_processor
from tract_querier import query_processor

import pytest

Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tract_label_indices.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import numpy as np

from .aabb import BoundingBox
from tract_querier.aabb import BoundingBox

__all__ = ['TractographySpatialIndexing']

Expand Down
4 changes: 2 additions & 2 deletions tract_querier/tract_math/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from inspect import getmembers

from .decorator import tract_math_operation, TractMathWrongArgumentsError
from tract_querier.tract_math.decorator import tract_math_operation, TractMathWrongArgumentsError

from . import operations as _operations
from tract_querier.tract_math import operations as _operations

operations = dict((
(f[0], f[1]) for f in getmembers(_operations) if hasattr(f[1], 'help_text')
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tract_math/decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import nibabel

from ..tractography import (
from tract_querier.tractography import (
Tractography, tractography_to_file
)
import os
Expand Down
12 changes: 6 additions & 6 deletions tract_querier/tract_math/operations.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .decorator import tract_math_operation, set_dictionary_from_use_filenames_as_index
from tract_querier.tract_math.decorator import tract_math_operation, set_dictionary_from_use_filenames_as_index

from warnings import warn

Expand All @@ -7,14 +7,14 @@
import nibabel
from nibabel.spatialimages import SpatialImage

from ..tractography import (
from tract_querier.tractography import (
Tractography, tractography_to_file, tractography_from_files
)

import sys
import traceback
from . import tensor_operations
from . import tract_operations
from tract_querier.tract_math import tensor_operations
from tract_querier.tract_math import tract_operations


try:
Expand Down Expand Up @@ -697,7 +697,7 @@ def tract_smooth(optional_flags, tractography, var, file_output):

@tract_math_operation('<tract_out>: compute the protoype tract')
def tract_prototype_median(optional_flags, tractography, file_output=None):
from .tract_obb import prototype_tract
from tract_querier.tract_math.tract_obb import prototype_tract

tracts = tractography.tracts()
data = tractography.tracts_data()
Expand All @@ -717,7 +717,7 @@ def tract_prototype_median(optional_flags, tractography, file_output=None):

@tract_math_operation('<smooth order> <tract_out>: compute the protoype tract')
def tract_prototype_mean(optional_flags, tractography, smooth_order, file_output=None):
from .tract_obb import prototype_tract
from tract_querier.tract_math.tract_obb import prototype_tract

tracts = tractography.tracts()
prototype_ix, leave_centers = prototype_tract(
Expand Down
6 changes: 3 additions & 3 deletions tract_querier/tract_math/tensor_operations.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy
from ..tractography import Tractography
from . import tract_operations
from ..tensor import scalar_measures
from tract_querier.tractography import Tractography
from tract_querier.tract_math import tract_operations
from tract_querier.tensor import scalar_measures

try:
from collections import OrderedDict
Expand Down
6 changes: 3 additions & 3 deletions tract_querier/tractography/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .tractography import Tractography
from .trackvis import tractography_from_trackvis_file, tractography_to_trackvis_file
from tract_querier.tractography.tractography import Tractography
from tract_querier.tractography.trackvis import tractography_from_trackvis_file, tractography_to_trackvis_file

from warnings import warn
import numpy
Expand All @@ -16,7 +16,7 @@
'tractography_from_vtk_files', 'tractography_to_vtk_file',
'vtkPolyData_to_tracts', 'tracts_to_vtkPolyData'
]
from .vtkInterface import (
from tract_querier.tractography.vtkInterface import (
tractography_from_vtk_files, tractography_to_vtk_file,
vtkPolyData_to_tracts, tracts_to_vtkPolyData
)
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tractography/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .test_tractography import *
from tract_querier.tractography.tests.test_tractography import *
7 changes: 3 additions & 4 deletions tract_querier/tractography/tests/test_tractography.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from .. import Tractography
from .. import (
from tract_querier.tractography import Tractography, tractography_from_files, tractography_to_file
from tract_querier.tractography.trackvis import (
tractography_from_trackvis_file, tractography_to_trackvis_file,
tractography_from_files, tractography_to_file
)

try:
VTK = True
from ..vtkInterface import (
from tract_querier.tractography.vtkInterface import (
tractography_from_vtk_files, tractography_to_vtk_file,
)
except ImportError:
Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tractography/trackvis.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import numpy

from .tractography import Tractography
from tract_querier.tractography import Tractography

from nibabel import trackvis

Expand Down
2 changes: 1 addition & 1 deletion tract_querier/tractography/vtkInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from vtk.util import numpy_support as ns
import numpy as np

from .tractography import Tractography
from tract_querier.tractography import Tractography
from functools import reduce


Expand Down

0 comments on commit a921454

Please sign in to comment.