From f81dfd84fde42fe596d7054aac5ad9d522696d1a Mon Sep 17 00:00:00 2001 From: "Josh Warner (Mac)" Date: Mon, 8 Jun 2015 17:20:10 -0500 Subject: [PATCH 1/2] FIX: typo in local version of tifffile _replace_by --- skimage/external/tifffile/tifffile_local.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/external/tifffile/tifffile_local.py b/skimage/external/tifffile/tifffile_local.py index 4ddd6763..eaeaee83 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.3' +__version__ = '0.3.4' __docformat__ = 'restructuredtext en' __all__ = ('imsave', 'imread', 'imshow', 'TiffFile', 'TiffWriter', 'TiffSequence') @@ -3114,7 +3114,7 @@ def _replace_by(module_function, package=None, warn=False): full_name = modname else: full_name = package + '.' + modname - module = __import__(full_name, romlist=[modname]) + module = __import__(full_name, fromlist=[modname]) func, oldfunc = getattr(module, function), func globals()['__old_' + func.__name__] = oldfunc except Exception: From 8d8ac736ed44035a34d347af0e36d77f95b23670 Mon Sep 17 00:00:00 2001 From: "Josh Warner (Mac)" Date: Mon, 8 Jun 2015 22:33:02 -0500 Subject: [PATCH 2/2] DOC/STY: Fix whitespace, harmonize version with PyPi 0.4.1 --- skimage/external/tifffile/tifffile_local.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/skimage/external/tifffile/tifffile_local.py b/skimage/external/tifffile/tifffile_local.py index eaeaee83..0e6a839b 100644 --- a/skimage/external/tifffile/tifffile_local.py +++ b/skimage/external/tifffile/tifffile_local.py @@ -1,5 +1,3 @@ - - #!/usr/bin/env python # -*- coding: utf-8 -*- # tifffile.py @@ -153,7 +151,7 @@ import numpy from . import _tifffile -__version__ = '0.3.4' +__version__ = '0.4.1' __docformat__ = 'restructuredtext en' __all__ = ('imsave', 'imread', 'imshow', 'TiffFile', 'TiffWriter', 'TiffSequence') @@ -4858,4 +4856,3 @@ if sys.version_info[0] > 2: if __name__ == "__main__": sys.exit(main()) -