BUG: Fix imports for Python 3.2.

skimage/color/__init__.py

@@ -1,4 +1 @@
-from colorconv import *
-
-
-
+from .colorconv import *

skimage/draw/__init__.py

@@ -1 +1 @@
-from draw import *
+from .draw import *

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

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

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

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):

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."""
+for further detail."""

skimage/io/_plugins/__init__.py

@@ -1 +1 @@
-from plugin import *
+from .plugin import *

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()

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):

skimage/measure/__init__.py

@@ -1 +1 @@
-from find_contours import find_contours
+from .find_contours import find_contours

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

skimage/segmentation/__init__.py

@@ -1 +1 @@
-from random_walker_segmentation import random_walker
+from .random_walker_segmentation import random_walker

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