From dfffd07e4a353c5ebd3644c98ca1a120852331dd Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 2 Nov 2014 07:03:15 -0600 Subject: [PATCH] Clean up the imports in the pil_plugin --- skimage/io/_plugins/pil_plugin.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/skimage/io/_plugins/pil_plugin.py b/skimage/io/_plugins/pil_plugin.py index fcc26e9e..e1390685 100644 --- a/skimage/io/_plugins/pil_plugin.py +++ b/skimage/io/_plugins/pil_plugin.py @@ -1,20 +1,12 @@ __all__ = ['imread', 'imsave'] import numpy as np - -try: - from PIL import Image -except ImportError: - raise ImportError("The Python Image Library could not be found. " - "Please refer to " - "https://pypi.python.org/pypi/Pillow/ (or " - "http://pypi.python.org/pypi/PIL/) " - "for further instructions.") +from six import string_types +from PIL import Image from skimage.util import img_as_ubyte, img_as_uint - -from six import string_types -from skimage.external.tifffile import imread as tif_imread, imsave as tif_imsave +from skimage.external.tifffile import ( + imread as tif_imread, imsave as tif_imsave) def imread(fname, dtype=None):