Use relative imports in skimage files

This commit is contained in:
Johannes Schönberger
2015-01-22 07:36:48 -05:00
parent ea95b5419b
commit ee5c6fbeb2
67 changed files with 149 additions and 155 deletions
+5
View File
@@ -8,8 +8,13 @@ For more images, see
import os as _os
<<<<<<< HEAD
from ..io import imread, use_plugin
from skimage import data_dir
=======
from .. import data_dir
from ..io import imread
>>>>>>> Use relative imports in skimage files
__all__ = ['load',