diff --git a/skimage/color/__init__.py b/skimage/color/__init__.py index a739e343..08b5f739 100644 --- a/skimage/color/__init__.py +++ b/skimage/color/__init__.py @@ -1,4 +1 @@ -from colorconv import * - - - +from .colorconv import * diff --git a/skimage/draw/__init__.py b/skimage/draw/__init__.py index 907a1ba7..c6df1f73 100644 --- a/skimage/draw/__init__.py +++ b/skimage/draw/__init__.py @@ -1 +1 @@ -from draw import * +from .draw import * diff --git a/skimage/exposure/__init__.py b/skimage/exposure/__init__.py index 83933f62..7e19d317 100644 --- a/skimage/exposure/__init__.py +++ b/skimage/exposure/__init__.py @@ -1,2 +1,2 @@ -from exposure import histogram, equalize, cumulative_distribution -from exposure import rescale_intensity +from .exposure import histogram, equalize, cumulative_distribution +from .exposure import rescale_intensity diff --git a/skimage/feature/__init__.py b/skimage/feature/__init__.py index fd3616f6..4e5d6324 100644 --- a/skimage/feature/__init__.py +++ b/skimage/feature/__init__.py @@ -1,4 +1,4 @@ -from hog import hog -from greycomatrix import greycomatrix, greycoprops -from peak import peak_local_max +from .hog import hog +from .greycomatrix import greycomatrix, greycoprops +from .peak import peak_local_max from .harris import harris diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index 1acc33f2..748487ac 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -1,7 +1,7 @@ -from lpi_filter import * -from ctmf import median_filter -from canny import canny -from edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt -from tv_denoise import tv_denoise -from rank_order import rank_order -from thresholding import threshold_otsu +from .lpi_filter import * +from .ctmf import median_filter +from .canny import canny +from .edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt +from .tv_denoise import tv_denoise +from .rank_order import rank_order +from .thresholding import threshold_otsu diff --git a/skimage/filter/ctmf.py b/skimage/filter/ctmf.py index 74ed536b..286932be 100644 --- a/skimage/filter/ctmf.py +++ b/skimage/filter/ctmf.py @@ -13,7 +13,7 @@ Original author: Lee Kamentsky import numpy as np from . import _ctmf -from rank_order import rank_order +from .rank_order import rank_order def median_filter(image, radius=2, mask=None, percent=50): diff --git a/skimage/graph/__init__.py b/skimage/graph/__init__.py index 1b55961b..9e2ac4e0 100644 --- a/skimage/graph/__init__.py +++ b/skimage/graph/__init__.py @@ -1,10 +1,10 @@ try: - from spath import shortest_path - from mcp import MCP, MCP_Geometric, route_through_array + from .spath import shortest_path + from .mcp import MCP, MCP_Geometric, route_through_array except ImportError: print """*** The cython extensions have not been compiled. Run python setup.py build_ext -i in the source directory to build in-place. Please refer to INSTALL.txt -for further detail.""" \ No newline at end of file +for further detail.""" diff --git a/skimage/io/_plugins/__init__.py b/skimage/io/_plugins/__init__.py index 309c2665..48aad58e 100644 --- a/skimage/io/_plugins/__init__.py +++ b/skimage/io/_plugins/__init__.py @@ -1 +1 @@ -from plugin import * +from .plugin import * diff --git a/skimage/io/_plugins/qt_plugin.py b/skimage/io/_plugins/qt_plugin.py index 3841e978..dd4e4a8f 100644 --- a/skimage/io/_plugins/qt_plugin.py +++ b/skimage/io/_plugins/qt_plugin.py @@ -1,4 +1,4 @@ -from util import prepare_for_display, window_manager, GuiLockError +from .util import prepare_for_display, window_manager, GuiLockError import numpy as np import sys @@ -134,7 +134,7 @@ def imshow(arr, fancy=False): if not fancy: iw = ImageWindow(arr, window_manager) else: - from skivi import SkiviImageWindow + from .skivi import SkiviImageWindow iw = SkiviImageWindow(arr, window_manager) iw.show() diff --git a/skimage/io/_plugins/skivi.py b/skimage/io/_plugins/skivi.py index ed6926cd..440e3c2c 100644 --- a/skimage/io/_plugins/skivi.py +++ b/skimage/io/_plugins/skivi.py @@ -22,8 +22,8 @@ from PyQt4.QtGui import (QApplication, QMainWindow, QImage, QPixmap, QLabel, QWidget, QVBoxLayout, QSlider, QPainter, QColor, QFrame, QLayoutItem) -from q_color_mixer import MixerPanel -from q_histogram import QuadHistogram +from .q_color_mixer import MixerPanel +from .q_histogram import QuadHistogram class ImageLabel(QLabel): diff --git a/skimage/measure/__init__.py b/skimage/measure/__init__.py index a9eb1526..beedd379 100755 --- a/skimage/measure/__init__.py +++ b/skimage/measure/__init__.py @@ -1 +1 @@ -from find_contours import find_contours +from .find_contours import find_contours diff --git a/skimage/morphology/__init__.py b/skimage/morphology/__init__.py index e3176579..d639be1c 100644 --- a/skimage/morphology/__init__.py +++ b/skimage/morphology/__init__.py @@ -1,6 +1,6 @@ -from grey import * -from selem import * +from .grey import * +from .selem import * from .ccomp import label -from watershed import watershed, is_local_maximum -from skeletonize import skeletonize, medial_axis +from .watershed import watershed, is_local_maximum +from .skeletonize import skeletonize, medial_axis from .convex_hull import convex_hull_image diff --git a/skimage/segmentation/__init__.py b/skimage/segmentation/__init__.py index f6eaea4a..118c3ec2 100644 --- a/skimage/segmentation/__init__.py +++ b/skimage/segmentation/__init__.py @@ -1 +1 @@ -from random_walker_segmentation import random_walker +from .random_walker_segmentation import random_walker diff --git a/skimage/transform/hough_transform.py b/skimage/transform/hough_transform.py index a1a0187c..6a1fff8a 100644 --- a/skimage/transform/hough_transform.py +++ b/skimage/transform/hough_transform.py @@ -1,6 +1,10 @@ __all__ = ['hough', 'probabilistic_hough'] -from itertools import izip +try: + from itertools import izip +except ImportError: + izip = zip + import numpy as np from ._hough_transform import _probabilistic_hough