use items/values for python2/3 compat

skimage/io/_plugins/plugin.py

@@ -12,13 +12,6 @@ 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
 
@@ -182,7 +175,7 @@ def available(loaded=False):
 
     """
     active_plugins = set()
-    for plugin_func in itervalues(plugin_store):
+    for plugin_func in plugin_store.values():
         for plugin, func in plugin_func:
             active_plugins.add(plugin)
 

skimage/viewer/plugins/base.py

@@ -7,15 +7,6 @@ from ..qt.QtCore import Qt
 from ..utils import RequiredAttr, init_qtapp
 
 
-# Python2/3 compatibility
-import sys
-PY2 = sys.version_info[0] == 2
-if PY2:
-    iteritems = lambda d: d.iteritems()
-else:
-    iteritems = lambda d: d.items()
-
-
 class Plugin(QtGui.QDialog):
     """Base class for plugins that interact with an ImageViewer.
 
@@ -162,7 +153,7 @@ class Plugin(QtGui.QDialog):
             return
         arguments = [self._get_value(a) for a in self.arguments]
         kwargs = dict([(name, self._get_value(a))
-                       for name, a in iteritems(self.keyword_arguments)])
+                       for name, a in self.keyword_arguments.items()])
         filtered = self.image_filter(*arguments, **kwargs)
         self.display_filtered_image(filtered)
 

skimage/viewer/utils/core.py

@@ -21,13 +21,6 @@ except ImportError:
 
 from ..qt import QtGui
 
-# Python2/3 compatibility
-import sys
-PY2 = sys.version_info[0] == 2
-if PY2:
-    iteritems = lambda d: d.iteritems()
-else:
-    iteritems = lambda d: d.items()
 
 __all__ = ['init_qtapp', 'start_qtapp', 'RequiredAttr', 'figimage',
            'LinearColormap', 'ClearColormap', 'FigureCanvas', 'new_plot']
@@ -88,7 +81,7 @@ class LinearColormap(LinearSegmentedColormap):
     """
     def __init__(self, name, segmented_data, **kwargs):
         segmented_data = dict((key, [(x, y, y) for x, y in value])
-                              for key, value in iteritems(segmented_data))
+                              for key, value in segmented_data.items())
         LinearSegmentedColormap.__init__(self, name, segmented_data, **kwargs)