Merge pull request #52 from cgohlke/patch-15

Fix Python 3 import errors

scikits/image/__init__.py

@@ -47,4 +47,4 @@ def get_log(name):
     logging.basicConfig(stream=sys.stdout, level=logging.WARNING)
     return logging.getLogger(name)
 
-from util.dtype import *
+from .util.dtype import *

scikits/image/draw/draw.py

@@ -3,4 +3,4 @@ Methods to draw on arrays.
 
 """
 
-from _draw import bresenham
+from ._draw import bresenham

scikits/image/morphology/__init__.py

@@ -1,4 +1,4 @@
 from grey import *
 from selem import *
-from ccomp import label
+from .ccomp import label
 from watershed import watershed, is_local_maximum

scikits/image/morphology/watershed.py

@@ -29,7 +29,7 @@ import numpy as np
 import scipy.ndimage
 from ..filter import rank_order
 
-import _watershed
+from . import _watershed
 import warnings
 
 def watershed(image, markers, connectivity=None, offset=None, mask=None):

scikits/image/transform/hough_transform.py

@@ -2,7 +2,7 @@ __all__ = ['hough', 'probabilistic_hough']
 
 from itertools import izip
 import numpy as np
-from _hough_transform import _probabilistic_hough  
+from ._hough_transform import _probabilistic_hough  
 
 def _hough(img, theta=None):
     if img.ndim != 2:

scikits/image/util/__init__.py

@@ -1,2 +1,2 @@
-from dtype import *
+from .dtype import *