Distances: Lint

Author: VesnaT

Orange/widgets/unsupervised/owdistances.py

@@ -6,7 +6,8 @@
 import Orange.data
 import Orange.misc
 from Orange import distance
-from Orange.widgets import gui, settings
+from Orange.widgets import gui
+from Orange.widgets.settings import Setting
 from Orange.widgets.utils.concurrent import TaskState, ConcurrentWidgetMixin
 from Orange.widgets.utils.sql import check_sql_input
 from Orange.widgets.utils.widgetpreview import WidgetPreview
@@ -69,14 +70,14 @@ class Outputs:
 
     settings_version = 2
 
-    axis = settings.Setting(0)        # type: int
-    metric_idx = settings.Setting(0)  # type: int
+    axis = Setting(0)        # type: int
+    metric_idx = Setting(0)  # type: int
 
     #: Use normalized distances if the metric supports it.
     #: The default is `True`, expect when restoring from old pre v2 settings
     #: (see `migrate_settings`).
-    normalized_dist = settings.Setting(True)  # type: bool
-    autocommit = settings.Setting(True)       # type: bool
+    normalized_dist = Setting(True)  # type: bool
+    autocommit = Setting(True)       # type: bool
 
     want_main_area = False
     buttons_area_orientation = Qt.Vertical
@@ -200,13 +201,13 @@ def on_done(self, dist: Orange.misc.DistMatrix):
         assert isinstance(dist, Orange.misc.DistMatrix) or dist is None
         self.Outputs.distances.send(dist)
 
-    def on_exception(self, e):
-        if isinstance(e, ValueError):
-            self.Error.distances_value_error(e)
-        elif isinstance(e, MemoryError):
+    def on_exception(self, ex):
+        if isinstance(ex, ValueError):
+            self.Error.distances_value_error(ex)
+        elif isinstance(ex, MemoryError):
             self.Error.distances_memory_error()
         else:
-            raise e
+            raise ex
 
     def onDeleteWidget(self):
         self.shutdown()

Orange/widgets/unsupervised/tests/test_owdistances.py

@@ -169,3 +169,7 @@ def test_too_big_array(self):
     def test_migrates_normalized_dist(self):
         w = self.create_widget(OWDistances, stored_settings={"metric_idx": 0})
         self.assertFalse(w.normalized_dist)
+
+
+if __name__ == "__main__":
+    unittest.main()