From fe02689f7b532dbb987a7dfb5d98162770275616 Mon Sep 17 00:00:00 2001
From: Jernej Urankar <jerneju@gmail.com>
Date: Wed, 21 Jun 2017 11:43:28 +0200
Subject: [PATCH] [FIX] Feature Constructor: no fail when no values
 https://sentry.io/biolab/orange3/issues/279049068/

---
 Orange/widgets/data/owfeatureconstructor.py   |  2 +-
 .../data/tests/test_owfeatureconstructor.py   | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Orange/widgets/data/owfeatureconstructor.py b/Orange/widgets/data/owfeatureconstructor.py
index 5790171f2f5..03dae6c5e3e 100644
--- a/Orange/widgets/data/owfeatureconstructor.py
+++ b/Orange/widgets/data/owfeatureconstructor.py
@@ -244,7 +244,7 @@ def setEditorData(self, data, domain):
     def editorData(self):
         values = self.valuesedit.text()
         values = re.split(r"(?<!\\),", values)
-        values = tuple(v.replace(r"\,", ",").strip() for v in values)
+        values = tuple(filter(None, [v.replace(r"\,", ",").strip() for v in values]))
         return DiscreteDescriptor(
             name=self.nameedit.text(),
             values=values,
diff --git a/Orange/widgets/data/tests/test_owfeatureconstructor.py b/Orange/widgets/data/tests/test_owfeatureconstructor.py
index 4a0e615a4b1..fbb164181bb 100644
--- a/Orange/widgets/data/tests/test_owfeatureconstructor.py
+++ b/Orange/widgets/data/tests/test_owfeatureconstructor.py
@@ -11,7 +11,8 @@
 from Orange.widgets.data.owfeatureconstructor import (DiscreteDescriptor,
                                                       ContinuousDescriptor,
                                                       StringDescriptor,
-                                                      construct_variables, OWFeatureConstructor)
+                                                      construct_variables, OWFeatureConstructor,
+                                                      DiscreteFeatureEditor)
 
 from Orange.widgets.data.owfeatureconstructor import freevars, validate_exp
 
@@ -238,3 +239,22 @@ def test_error_invalid_expression(self):
         )
         self.widget.apply()
         self.assertTrue(self.widget.Error.invalid_expressions.is_shown())
+
+    def test_discrete_no_values(self):
+        """
+        Should not fail when there are no values set.
+        GH-2417
+        """
+        data = Table("iris")
+        self.widget.setData(data)
+        discreteFeatureEditor = DiscreteFeatureEditor()
+
+        discreteFeatureEditor.valuesedit.setText("")
+        discreteFeatureEditor.nameedit.setText("D1")
+        discreteFeatureEditor.expressionedit.setText("iris")
+        self.widget.addFeature(
+            discreteFeatureEditor.editorData()
+        )
+        self.assertFalse(self.widget.Error.more_values_needed.is_shown())
+        self.widget.apply()
+        self.assertTrue(self.widget.Error.more_values_needed.is_shown())