From b57bd821f0df367aaf0c993bce87c60875b813d2 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Oct 2011 16:06:03 -0700 Subject: [PATCH 1/6] Fix Python 3 import error --- scikits/image/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/__init__.py b/scikits/image/__init__.py index 6d896905..c9307cf9 100644 --- a/scikits/image/__init__.py +++ b/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 * From be02b9a651d8251638c2f8cfe38621482cacb0ca Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Oct 2011 16:07:24 -0700 Subject: [PATCH 2/6] Fix Python 3 import error --- scikits/image/util/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/util/__init__.py b/scikits/image/util/__init__.py index 6eb4da1c..6ef65e20 100644 --- a/scikits/image/util/__init__.py +++ b/scikits/image/util/__init__.py @@ -1,2 +1,2 @@ -from dtype import * +from .dtype import * From 58226e3fca942f4424f2777a2ee3970b2ac7d7e8 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Oct 2011 16:08:13 -0700 Subject: [PATCH 3/6] Fix Python 3 import error --- scikits/image/transform/hough_transform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/transform/hough_transform.py b/scikits/image/transform/hough_transform.py index 31ffa565..44c26623 100644 --- a/scikits/image/transform/hough_transform.py +++ b/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: From 09e0ecdf9607364ff70701bd6aac2e2d8a3738b8 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Oct 2011 16:09:12 -0700 Subject: [PATCH 4/6] Edited scikits/image/morphology/watershed.py via GitHub --- scikits/image/morphology/watershed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/morphology/watershed.py b/scikits/image/morphology/watershed.py index 759773fe..37db82b6 100644 --- a/scikits/image/morphology/watershed.py +++ b/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): From 17ff626bf66e283e381fffcc6ac2ac2000338112 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Oct 2011 16:09:43 -0700 Subject: [PATCH 5/6] Edited scikits/image/draw/draw.py via GitHub --- scikits/image/draw/draw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/draw/draw.py b/scikits/image/draw/draw.py index 9360623a..e66faf1c 100644 --- a/scikits/image/draw/draw.py +++ b/scikits/image/draw/draw.py @@ -3,4 +3,4 @@ Methods to draw on arrays. """ -from _draw import bresenham +from ._draw import bresenham From 7c586cfeff2116e56e258df39c2d3b5d8f9a98ed Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Oct 2011 16:10:39 -0700 Subject: [PATCH 6/6] Edited scikits/image/morphology/__init__.py via GitHub --- scikits/image/morphology/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/morphology/__init__.py b/scikits/image/morphology/__init__.py index 4036cc25..03cf49e0 100644 --- a/scikits/image/morphology/__init__.py +++ b/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