From 713452ab9eacbcff32dbd1a075aa872883344f40 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 16 Oct 2014 05:28:43 -0500 Subject: [PATCH] Use newer version of tifffile.py. --- skimage/external/tifffile/tifffile_local.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skimage/external/tifffile/tifffile_local.py b/skimage/external/tifffile/tifffile_local.py index 29b4bbdb..b5a67ccf 100644 --- a/skimage/external/tifffile/tifffile_local.py +++ b/skimage/external/tifffile/tifffile_local.py @@ -153,7 +153,7 @@ import numpy from . import _tifffile -__version__ = '0.3.2' +__version__ = '0.3.3' __docformat__ = 'restructuredtext en' __all__ = ('imsave', 'imread', 'imshow', 'TiffFile', 'TiffWriter', 'TiffSequence') @@ -181,7 +181,7 @@ def imsave(filename, data, **kwargs): Examples -------- >>> data = numpy.random.rand(2, 5, 3, 301, 219) - >>> description = u'{"shape": %s}' % str(list(data.shape)) + >>> description = '{"shape": %s}' % str(list(data.shape)) >>> imsave('temp.tif', data, compress=6, ... extratags=[(270, 's', 0, description, True)]) @@ -3448,7 +3448,7 @@ def stripnull(string): Clean NULL terminated C strings. - >>> stripnull(b'string\\x00') + >>> stripnull(b'string\\x00') # doctest: +SKIP b'string' """ @@ -3461,9 +3461,9 @@ def stripascii(string): Clean NULL separated and terminated TIFF strings. - >>> stripascii(b'string\\x00string\\n\\x01\\x00') + >>> stripascii(b'string\\x00string\\n\\x01\\x00') # doctest: +SKIP b'string\\x00string\\n' - >>> stripascii(b'\\x00') + >>> stripascii(b'\\x00') # doctest: +SKIP b'' """