diff --git a/doc/logo/scikit_image_logo.py b/doc/logo/scikit_image_logo.py index 014c5786..fef3a234 100644 --- a/doc/logo/scikit_image_logo.py +++ b/doc/logo/scikit_image_logo.py @@ -24,6 +24,12 @@ from skimage.filter import sobel import scipy_logo +# Python2/3 compatibility +PY2 = sys.version_info[0] == 2 +if PY2: + itervalues = lambda d: d.itervalues() +else: + itervalues = lambda d: d.values() # Utility functions # ================= @@ -49,7 +55,7 @@ def prepare_axes(ax): plt.sca(ax) ax.xaxis.set_visible(False) ax.yaxis.set_visible(False) - for spine in ax.spines.itervalues(): + for spine in itervalues(ax.spines): spine.set_visible(False) diff --git a/skimage/io/_plugins/plugin.py b/skimage/io/_plugins/plugin.py index 7c25fb4e..d8bb0a76 100644 --- a/skimage/io/_plugins/plugin.py +++ b/skimage/io/_plugins/plugin.py @@ -12,6 +12,14 @@ except ImportError: import os.path from glob import glob +# Python2/3 compatibility +import sys +PY2 = sys.version_info[0] == 2 +if PY2: + itervalues = lambda d: d.itervalues() +else: + itervalues = lambda d: d.values() + plugin_store = None plugin_provides = {} @@ -174,7 +182,7 @@ def available(loaded=False): """ active_plugins = set() - for plugin_func in plugin_store.itervalues(): + for plugin_func in itervalues(plugin_store): for plugin, func in plugin_func: active_plugins.add(plugin)