Database: Pivoting table

Normalize: fix unpickling for Normalizers before caching was implemented

MANIFEST.in

@@ -1,7 +1,7 @@
 recursive-include orangecontrib/text/datasets *.tab *.txt
 recursive-include orangecontrib/text/models *.ftz
 recursive-include orangecontrib/text/sentiment *.txt
-recursive-include orangecontrib/text/tests *.txt *.json
+recursive-include orangecontrib/text/tests *.txt *.json *.pkl
 recursive-include orangecontrib/text/tutorials *.ows
 recursive-include orangecontrib/text/widgets/icons *.svg *.png *.ai
 recursive-include orangecontrib/text/widgets/resources *.js *.css *.html

orangecontrib/text/preprocess/normalize.py

@@ -48,6 +48,12 @@ def __getstate__(self):
         d["_normalization_cache"] = {}
         return d
 
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+        # support old pickles (before caching was implemented) that are missing
+        # _normalization_cache
+        self._normalization_cache = {}
+
 
 class WordNetLemmatizer(BaseNormalizer):
     name = 'WordNet Lemmatizer'
@@ -201,7 +207,7 @@ def __setstate__(self, state):
 
         Note: __model will be loaded on __call__
         """
-        self.__dict__.update(state)
+        super().__setstate__(state)
         self.models = UDPipeModels()
 
 

orangecontrib/text/tests/test_preprocess.py

@@ -340,6 +340,16 @@ def test_cache(self):
         loaded_normalizer = pickle.loads(pickle.dumps(normalizer))
         self.assertEqual(0, len(loaded_normalizer._normalization_cache))
 
+    def test_nocache_normalizer_restorable(self):
+        """
+        Pickled normalizers made before implementing cache in normalizer must
+        load correctly
+        """
+        test_folder = os.path.dirname(os.path.abspath(__file__))
+        with open(os.path.join(test_folder, "data", "normalizer-v1.pkl"), "rb") as f:
+            loaded_normalizer = pickle.load(f)
+        loaded_normalizer(self.corpus)
+
 
 class UDPipeModelsTests(unittest.TestCase):
     def test_label_transform(self):