From 3931f1816983e7d5687787f2624fa5193a424a61 Mon Sep 17 00:00:00 2001 From: blink1073 Date: Sun, 16 Feb 2014 21:22:44 -0600 Subject: [PATCH 1/2] Add py3k compatibility for core widget and overlayplugin. Dictionary keys are treated differently in py3k, causing the Canny plugin to not work on py3k. --- skimage/viewer/plugins/overlayplugin.py | 2 +- skimage/viewer/widgets/core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/viewer/plugins/overlayplugin.py b/skimage/viewer/plugins/overlayplugin.py index 334838d7..e1b2f521 100644 --- a/skimage/viewer/plugins/overlayplugin.py +++ b/skimage/viewer/plugins/overlayplugin.py @@ -45,7 +45,7 @@ class OverlayPlugin(Plugin): self._overlay_plot = None self._overlay = None self.cmap = None - self.color_names = self.colors.keys() + self.color_names = [c for c in self.colors.keys()] def attach(self, image_viewer): super(OverlayPlugin, self).attach(image_viewer) diff --git a/skimage/viewer/widgets/core.py b/skimage/viewer/widgets/core.py index b9714d38..ba5873cd 100644 --- a/skimage/viewer/widgets/core.py +++ b/skimage/viewer/widgets/core.py @@ -232,7 +232,7 @@ class ComboBox(BaseWidget): self.name_label.setAlignment(QtCore.Qt.AlignLeft) self._combo_box = QtGui.QComboBox() - self._combo_box.addItems(items) + self._combo_box.addItems([i for i in items]) self.layout = QtGui.QHBoxLayout(self) self.layout.addWidget(self.name_label) From 44dc93d373982bc52ad760297942e4bf1657e70c Mon Sep 17 00:00:00 2001 From: blink1073 Date: Mon, 17 Feb 2014 05:39:33 -0600 Subject: [PATCH 2/2] Use the more idiomatic list(). --- skimage/viewer/plugins/overlayplugin.py | 2 +- skimage/viewer/widgets/core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/viewer/plugins/overlayplugin.py b/skimage/viewer/plugins/overlayplugin.py index e1b2f521..373d6bf4 100644 --- a/skimage/viewer/plugins/overlayplugin.py +++ b/skimage/viewer/plugins/overlayplugin.py @@ -45,7 +45,7 @@ class OverlayPlugin(Plugin): self._overlay_plot = None self._overlay = None self.cmap = None - self.color_names = [c for c in self.colors.keys()] + self.color_names = list(self.colors.keys()) def attach(self, image_viewer): super(OverlayPlugin, self).attach(image_viewer) diff --git a/skimage/viewer/widgets/core.py b/skimage/viewer/widgets/core.py index ba5873cd..2bbf53d2 100644 --- a/skimage/viewer/widgets/core.py +++ b/skimage/viewer/widgets/core.py @@ -232,7 +232,7 @@ class ComboBox(BaseWidget): self.name_label.setAlignment(QtCore.Qt.AlignLeft) self._combo_box = QtGui.QComboBox() - self._combo_box.addItems([i for i in items]) + self._combo_box.addItems(list(items)) self.layout = QtGui.QHBoxLayout(self) self.layout.addWidget(self.name_label)