From f0506f1293bc77544f5dd406c56981beeba8dcc9 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 28 Jun 2013 17:24:46 -0500 Subject: [PATCH] Fix imports under Python 3. --- skimage/viewer/canvastools/__init__.py | 6 +++--- skimage/viewer/canvastools/linetool.py | 2 +- skimage/viewer/canvastools/painttool.py | 2 +- skimage/viewer/utils/__init__.py | 2 +- skimage/viewer/widgets/__init__.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/skimage/viewer/canvastools/__init__.py b/skimage/viewer/canvastools/__init__.py index 22a2d205..f5b89e2c 100644 --- a/skimage/viewer/canvastools/__init__.py +++ b/skimage/viewer/canvastools/__init__.py @@ -1,3 +1,3 @@ -from linetool import LineTool, ThickLineTool -from recttool import RectangleTool -from painttool import PaintTool +from .linetool import LineTool, ThickLineTool +from .recttool import RectangleTool +from .painttool import PaintTool diff --git a/skimage/viewer/canvastools/linetool.py b/skimage/viewer/canvastools/linetool.py index 7a459401..0b1d3b0c 100644 --- a/skimage/viewer/canvastools/linetool.py +++ b/skimage/viewer/canvastools/linetool.py @@ -5,7 +5,7 @@ try: except ImportError: print("Could not import matplotlib -- skimage.viewer not available.") -from base import CanvasToolBase, ToolHandles +from .base import CanvasToolBase, ToolHandles __all__ = ['LineTool', 'ThickLineTool'] diff --git a/skimage/viewer/canvastools/painttool.py b/skimage/viewer/canvastools/painttool.py index 3fbab153..b5d67229 100644 --- a/skimage/viewer/canvastools/painttool.py +++ b/skimage/viewer/canvastools/painttool.py @@ -8,7 +8,7 @@ try: except ImportError: print("Could not import matplotlib -- skimage.viewer not available.") -from base import CanvasToolBase +from .base import CanvasToolBase __all__ = ['PaintTool'] diff --git a/skimage/viewer/utils/__init__.py b/skimage/viewer/utils/__init__.py index 5af24064..bb67a43f 100644 --- a/skimage/viewer/utils/__init__.py +++ b/skimage/viewer/utils/__init__.py @@ -1 +1 @@ -from core import * +from .core import * diff --git a/skimage/viewer/widgets/__init__.py b/skimage/viewer/widgets/__init__.py index 6552a313..efa9fe9d 100644 --- a/skimage/viewer/widgets/__init__.py +++ b/skimage/viewer/widgets/__init__.py @@ -1,2 +1,2 @@ -from core import * -from history import * +from .core import * +from .history import *