From eb6867cfe23ecdec73fdc23d60e2339a5ed28c70 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Sun, 27 Oct 2013 14:06:26 +0200 Subject: [PATCH] Make six an external dependency. --- setup.py | 1 + skimage/_shared/utils.py | 2 +- skimage/color/colorlabel.py | 5 +++-- skimage/io/_io.py | 3 ++- skimage/io/_plugins/pil_plugin.py | 4 ++-- skimage/io/collection.py | 3 ++- skimage/io/tests/test_collection.py | 3 ++- skimage/io/tests/test_pil.py | 3 ++- skimage/novice/_novice.py | 2 +- skimage/transform/_geometric.py | 6 +++--- skimage/util/arraypad.py | 2 +- skimage/viewer/plugins/overlayplugin.py | 3 ++- 12 files changed, 22 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index 7f5c6cdc..8c1ecb54 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ PYTHON_VERSION = (2, 5) DEPENDENCIES = { 'numpy': (1, 6), 'Cython': (0, 17), + 'six': (1, 3), } diff --git a/skimage/_shared/utils.py b/skimage/_shared/utils.py index b7071521..980ff639 100644 --- a/skimage/_shared/utils.py +++ b/skimage/_shared/utils.py @@ -2,7 +2,7 @@ import warnings import functools import sys -from . import six +import six __all__ = ['deprecated', 'get_bound_method_class'] diff --git a/skimage/color/colorlabel.py b/skimage/color/colorlabel.py index 70803961..222c50c8 100644 --- a/skimage/color/colorlabel.py +++ b/skimage/color/colorlabel.py @@ -4,11 +4,12 @@ import itertools import numpy as np from skimage import img_as_float -from skimage._shared import six -from skimage._shared.six.moves import zip from .colorconv import rgb2gray, gray2rgb from . import rgb_colors +import six +from six.moves import zip + __all__ = ['color_dict', 'label2rgb', 'DEFAULT_COLORS'] diff --git a/skimage/io/_io.py b/skimage/io/_io.py index a7df4694..54769edc 100644 --- a/skimage/io/_io.py +++ b/skimage/io/_io.py @@ -12,10 +12,11 @@ import tempfile from io import BytesIO import numpy as np +import six from skimage.io._plugins import call as call_plugin from skimage.color import rgb2grey -from skimage._shared import six + # Shared image queue diff --git a/skimage/io/_plugins/pil_plugin.py b/skimage/io/_plugins/pil_plugin.py index 2ddbfe26..c6e968dc 100644 --- a/skimage/io/_plugins/pil_plugin.py +++ b/skimage/io/_plugins/pil_plugin.py @@ -11,7 +11,7 @@ except ImportError: from skimage.util import img_as_ubyte -from skimage._shared import six +from six import string_types def imread(fname, dtype=None): @@ -106,7 +106,7 @@ def imsave(fname, arr, format_str=None): arr = arr.astype(np.uint8) # default to PNG if file-like object - if not isinstance(fname, six.string_types) and format_str is None: + if not isinstance(fname, string_types) and format_str is None: format_str = "PNG" img = Image.fromstring(mode, (arr.shape[1], arr.shape[0]), arr.tostring()) diff --git a/skimage/io/collection.py b/skimage/io/collection.py index 96855dbd..175d3b34 100644 --- a/skimage/io/collection.py +++ b/skimage/io/collection.py @@ -10,7 +10,8 @@ from copy import copy import numpy as np from ._io import imread -from .._shared import six + +import six def concatenate_images(ic): diff --git a/skimage/io/tests/test_collection.py b/skimage/io/tests/test_collection.py index f56d753b..cf5ef820 100644 --- a/skimage/io/tests/test_collection.py +++ b/skimage/io/tests/test_collection.py @@ -12,7 +12,8 @@ from skimage import data_dir from skimage.io import ImageCollection, MultiImage from skimage.io.collection import alphanumeric_key from skimage.io import Image as ioImage -from skimage._shared import six + +import six try: diff --git a/skimage/io/tests/test_pil.py b/skimage/io/tests/test_pil.py index aa582ebc..243d2fd1 100644 --- a/skimage/io/tests/test_pil.py +++ b/skimage/io/tests/test_pil.py @@ -8,7 +8,8 @@ from tempfile import NamedTemporaryFile from skimage import data_dir from skimage.io import (imread, imsave, use_plugin, reset_plugins, Image as ioImage) -from skimage._shared.six import BytesIO + +from six import BytesIO try: diff --git a/skimage/novice/_novice.py b/skimage/novice/_novice.py index 2fc4b280..836458a7 100644 --- a/skimage/novice/_novice.py +++ b/skimage/novice/_novice.py @@ -7,8 +7,8 @@ from skimage import io from skimage import img_as_ubyte from skimage.transform import resize from skimage.color import color_dict -from skimage._shared import six +import six # Convert colors from `skimage.color` to uint8 and allow access through # dict or a named tuple. diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py index c1f49fa5..6137383d 100644 --- a/skimage/transform/_geometric.py +++ b/skimage/transform/_geometric.py @@ -1,11 +1,11 @@ +import six import math import numpy as np from scipy import ndimage, spatial -from skimage.util import img_as_float -from ._warps_cy import _warp_fast from skimage._shared.utils import get_bound_method_class -from skimage._shared import six +from skimage.util import img_as_float +from ._warps_cy import _warp_fast class GeometricTransform(object): diff --git a/skimage/util/arraypad.py b/skimage/util/arraypad.py index 93f66bb8..7ca70f59 100644 --- a/skimage/util/arraypad.py +++ b/skimage/util/arraypad.py @@ -4,8 +4,8 @@ of an n-dimensional array. """ from __future__ import division, absolute_import, print_function -from skimage._shared.six import integer_types +from six import integer_types import numpy as np try: diff --git a/skimage/viewer/plugins/overlayplugin.py b/skimage/viewer/plugins/overlayplugin.py index dc5ca060..c70dd373 100644 --- a/skimage/viewer/plugins/overlayplugin.py +++ b/skimage/viewer/plugins/overlayplugin.py @@ -3,7 +3,8 @@ from warnings import warn from skimage.util.dtype import dtype_range from .base import Plugin from ..utils import ClearColormap, update_axes_image -from skimage._shared import six + +import six __all__ = ['OverlayPlugin']