Merge pull request #5001 from janezd/remove-backward-gui-imports

Gui: Remove backward-compatibility imports
biolab · Sep 25, 2020 · 9c07ac0 · 9c07ac0
2 parents c500dc8 + 804bac7
commit 9c07ac0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/Orange/widgets/gui.py b/Orange/widgets/gui.py
@@ -33,14 +33,6 @@
     ControlGetter, VerticalScrollArea, ProgressBar,
     ControlledCallback, ControlledCallFront, ValueCallback, connectControl,
 )
-# exposed for backcompat. Should not be imported from here, or not
-# imported at all
-from orangewidget.gui import (
-    SpinBoxWFocusOut, DoubleSpinBoxWFocusOut, LineEditWFocusOut, OrangeComboBox
-)  # pylint: disable=unused-import
-from Orange.widgets.utils.buttons import (
-    VariableTextPushButton
-)  # pylint: disable=unused-import
 
 
 try:

diff --git a/Orange/widgets/unsupervised/owlouvainclustering.py b/Orange/widgets/unsupervised/owlouvainclustering.py
@@ -124,12 +124,12 @@ def __init__(self):
             graph_box, self, "metric_idx", label="Distance metric",
             items=[m[0] for m in METRICS], callback=self._invalidate_graph,
             orientation=Qt.Horizontal,
-        )  # type: gui.OrangeComboBox
+        )
         self.k_neighbors_spin = gui.spin(
             graph_box, self, "k_neighbors", minv=1, maxv=_MAX_K_NEIGBOURS,
             label="k neighbors", controlWidth=80, alignment=Qt.AlignRight,
             callback=self._invalidate_graph,
-        )  # type: gui.SpinBoxWFocusOut
+        )
         self.resolution_spin = gui.hSlider(
             graph_box, self, "resolution", minValue=0, maxValue=5., step=1e-1,
             label="Resolution", intOnly=False, labelFormat="%.1f",

diff --git a/Orange/widgets/visualize/owpythagoreanforest.py b/Orange/widgets/visualize/owpythagoreanforest.py
@@ -220,12 +220,12 @@ def __init__(self):
             box_display, self, 'target_class_index', label='Target class',
             orientation=Qt.Horizontal, items=[], contentsLength=8,
             searchable=True
-        )  # type: gui.OrangeComboBox
+        )
         self.ui_size_calc_combo = gui.comboBox(
             box_display, self, 'size_calc_idx', label='Size',
             orientation=Qt.Horizontal,
             items=list(zip(*self.SIZE_CALCULATION))[0], contentsLength=8,
-        )  # type: gui.OrangeComboBox
+        )
         self.ui_zoom_slider = gui.hSlider(
             box_display, self, 'zoom', label='Zoom', ticks=False, minValue=100,
             maxValue=400, createLabel=False, intOnly=False,