From 672214558243fefb1a3a811da649c1115f17d865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Primo=C5=BE=20Godec?= <p.godec9@gmail.com>
Date: Fri, 3 Jul 2020 11:06:55 +0200
Subject: [PATCH] Re-add TupleList to DiscreteVariable

---
 Orange/data/tests/test_variable.py         |  24 +++++++++++++++++++--
 Orange/data/variable.py                    |   3 +++
 Orange/tests/datasets/iris-orange-3-25.pkl | Bin 0 -> 9009 bytes
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 Orange/tests/datasets/iris-orange-3-25.pkl

diff --git a/Orange/data/tests/test_variable.py b/Orange/data/tests/test_variable.py
index 98bf8f2a9e1..a0109c47e25 100644
--- a/Orange/data/tests/test_variable.py
+++ b/Orange/data/tests/test_variable.py
@@ -1,12 +1,13 @@
 # Test methods with long descriptive names can omit docstrings
 # pylint: disable=missing-docstring
 # pylint: disable=protected-access
-
+import os
 import sys
 import math
 import unittest
 import pickle
 import pkgutil
+import warnings
 from datetime import datetime, timezone
 
 from io import StringIO
@@ -16,7 +17,7 @@
 
 import Orange
 from Orange.data import Variable, ContinuousVariable, DiscreteVariable, \
-    StringVariable, TimeVariable, Unknown, Value
+    StringVariable, TimeVariable, Unknown, Value, Table
 from Orange.data.io import CSVReader
 from Orange.preprocess.transformation import Identity
 from Orange.tests.base import create_pickling_tests
@@ -500,6 +501,25 @@ def test_remove_ordered(self):
         """
         self.assertLess(Orange.__version__, "3.29.0")
 
+    @staticmethod
+    def test_pickle_backward_compatibility():
+        """
+        Test that pickle made with an older version of Orange are correctly
+        loaded after changes in DiscreteVariable
+        """
+        with warnings.catch_warnings():
+            # travis/gh-action tests change OrangeDeprecationWarning to error
+            # temporary disable it
+            warnings.simplefilter('default', OrangeDeprecationWarning)
+            this_dir = os.path.dirname(os.path.realpath(__file__))
+            datasets_dir = os.path.join(
+                this_dir, "..", "..", "tests", "datasets"
+            )
+            # pickle with values as list
+            Table(os.path.join(datasets_dir, "sailing-orange-3-20.pkl"))
+            # pickle with values as tuple list
+            Table(os.path.join(datasets_dir, "iris-orange-3-25.pkl"))
+
 
 @variabletest(ContinuousVariable)
 class TestContinuousVariable(VariableTest):
diff --git a/Orange/data/variable.py b/Orange/data/variable.py
index fc7a14d2767..21d03ed653a 100644
--- a/Orange/data/variable.py
+++ b/Orange/data/variable.py
@@ -602,6 +602,9 @@ def copy(self, compute_value=Variable._CopyComputeValue,
         return var
 
 
+TupleList = tuple # backward compatibility (for pickled table)
+
+
 class DiscreteVariable(Variable):
     """
     Descriptor for symbolic, discrete variables. Values of discrete variables
diff --git a/Orange/tests/datasets/iris-orange-3-25.pkl b/Orange/tests/datasets/iris-orange-3-25.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..3b5d5daa3d41d4990e1b2339bd355a70df5a63af
GIT binary patch
literal 9009
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

literal 0
HcmV?d00001