Fix import and failing doctest

scikit-image · Jun 18, 2015 · 5f6fc04 · 5f6fc04
1 parent 06a710b
commit 5f6fc04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/skimage/external/test_tifffile.py b/skimage/external/test_tifffile.py
@@ -34,7 +34,7 @@ def test_imread_uint16_big_endian():
 
 
 def test_extension():
-    from tifffile.tifffile import decodelzw
+    from .tifffile.tifffile import decodelzw
     import types
     assert isinstance(decodelzw, types.BuiltinFunctionType), type(decodelzw)
 

diff --git a/skimage/external/tifffile/tifffile.py b/skimage/external/tifffile/tifffile.py
@@ -185,8 +185,8 @@ def imsave(filename, data, **kwargs):
     Examples
     --------
     >>> data = numpy.random.rand(2, 5, 3, 301, 219)
-    >>> description = u'{"shape": %s}' % str(list(data.shape))
-    >>> imsave('temp.tif', data, compress=6,
+    >>> description = u'{"shape": %s}' % str(list(data.shape))  # doctest: +SKIP
+    >>> imsave('temp.tif', data, compress=6,  # doctest: +SKIP
     ...        extratags=[(270, 's', 0, description, True)])
 
     """