Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Use absolute imports in io #1005

Merged
merged 6 commits into from Apr 4, 2016
Merged

FIX: Use absolute imports in io #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d89cf9a
Make use of absolute import
souravsingh Mar 22, 2016
11e569a
Make use of absolute import in gradients
souravsingh Mar 22, 2016
3c16e52
Use absolute import in pickles
souravsingh Mar 22, 2016
10e74b9
Use absolute import in test_dpy
souravsingh Mar 22, 2016
60d4054
Use absolute import in test_io
souravsingh Mar 22, 2016
5c874f5
Fix the import statement in test_io
souravsingh Mar 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dipy/io/dpy.py
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
import numpy as np

# Conditional import machinery for pytables
from ..utils.optpkg import optional_package
from dipy.utils.optpkg import optional_package

# Allow import, but disable doctests, if we don't have pytables
tables, have_tables, setup_module = optional_package('tables')
Expand Down
2 changes: 1 addition & 1 deletion dipy/io/gradients.py
View file
Open in desktop
@@ -1,7 +1,7 @@
from __future__ import division, print_function, absolute_import

from os.path import splitext
from ..utils.six import string_types
from dipy.utils.six import string_types
import numpy as np


Expand Down
2 changes: 1 addition & 1 deletion dipy/io/pickles.py
View file
Open in desktop
@@ -1,6 +1,6 @@
""" Load and save pickles """
# Python 3 merged cPickle into pickle
from ..utils.six.moves import cPickle
from dipy.utils.six.moves import cPickle


def save_pickle(fname, dix):
Expand Down
2 changes: 1 addition & 1 deletion dipy/io/tests/test_dpy.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

from nibabel.tmpdirs import InTemporaryDirectory

from ..dpy import Dpy, have_tables
from dipy.io.dpy import Dpy, have_tables


from nose.tools import assert_true, assert_false, \
Expand Down
2 changes: 1 addition & 1 deletion dipy/io/tests/test_io.py
View file
Open in desktop
@@ -1,7 +1,7 @@
""" Tests for overall io sub-package
"""

from ... import io
from dipy import io

from nose.tools import assert_false

Expand Down