From d63f4b53a166a1f84649bb03d3d29145f4505692 Mon Sep 17 00:00:00 2001
From: janezd <janez.demsar@fri.uni-lj.si>
Date: Fri, 16 Jun 2017 10:15:14 +0200
Subject: [PATCH] Enum: Fix reduce of nested enums

---
 Orange/__init__.py              |  1 +
 Orange/preprocess/preprocess.py | 30 +++++++++++++++++++-----------
 Orange/tests/test_preprocess.py | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/Orange/__init__.py b/Orange/__init__.py
index 8b653e37cbd..cf9cd2b8246 100644
--- a/Orange/__init__.py
+++ b/Orange/__init__.py
@@ -7,6 +7,7 @@
 dill.settings['protocol'] = pickle.HIGHEST_PROTOCOL
 dill.settings['recurse'] = True
 dill.settings['byref'] = True
+pickle.DEFAULT_PROTOCOL = 4
 
 from .misc.lazy_module import _LazyModule
 from .misc.datasets import _DatasetInfo
diff --git a/Orange/preprocess/preprocess.py b/Orange/preprocess/preprocess.py
index 0be18881554..684652872e8 100644
--- a/Orange/preprocess/preprocess.py
+++ b/Orange/preprocess/preprocess.py
@@ -33,12 +33,14 @@ def __call__(self, data):
 
 
 class Continuize(Preprocess):
+    MultinomialTreatment = Enum(
+        "Continuize",
+        ("Indicators", "FirstAsBase", "FrequentAsBase", "Remove",
+         "RemoveMultinomial", "ReportError", "AsOrdinal", "AsNormalizedOrdinal",
+         "Leave"),
+        qualname="Continuize.MultinomialTreatment")
     (Indicators, FirstAsBase, FrequentAsBase, Remove, RemoveMultinomial,
-     ReportError, AsOrdinal, AsNormalizedOrdinal, Leave) = Enum(
-         "Continuize",
-         "Indicators, FirstAsBase, FrequentAsBase,"
-         "Remove, RemoveMultinomial, ReportError, AsOrdinal,"
-         "AsNormalizedOrdinal, Leave")
+     ReportError, AsOrdinal, AsNormalizedOrdinal, Leave) = MultinomialTreatment
 
     def __init__(self, zero_based=True,
                  multinomial_treatment=Indicators):
@@ -255,8 +257,8 @@ class Normalize(Preprocess):
     >>> normalizer = Normalize(norm_type=Normalize.NormalizeBySpan)
     >>> normalized_data = normalizer(data)
     """
-    Type = Enum("Normalize",
-                "NormalizeBySpan, NormalizeBySD")
+    Type = Enum("Normalize", ("NormalizeBySpan", "NormalizeBySD"),
+                qualname="Normalize.Type")
     NormalizeBySpan, NormalizeBySD = Type
 
     def __init__(self,
@@ -326,8 +328,12 @@ class Randomize(Preprocess):
     >>> randomizer = Randomize(Randomize.RandomizeClasses)
     >>> randomized_data = randomizer(data)
     """
-    Type = Enum("Randomize", dict(RandomizeClasses=1, RandomizeAttributes=2,
-                                  RandomizeMetas=4), type=int)
+    Type = Enum("Randomize",
+                dict(RandomizeClasses=1,
+                     RandomizeAttributes=2,
+                     RandomizeMetas=4),
+                type=int,
+                qualname="Randomize.Type")
     RandomizeClasses, RandomizeAttributes, RandomizeMetas = Type
 
     def __init__(self, rand_type=RandomizeClasses, rand_seed=None):
@@ -396,8 +402,10 @@ class _MethodEnum(Enum):
         def __call__(self, *args, **kwargs):
             return getattr(Scale, '_' + self.name)(*args, **kwargs)
 
-    CenteringType = _MethodEnum('Scale', 'NoCentering, Mean, Median')
-    ScalingType = _MethodEnum('Scale', 'NoScaling, Std, Span')
+    CenteringType = _MethodEnum("Scale", ("NoCentering", "Mean", "Median"),
+                                qualname="Scale.CenteringType")
+    ScalingType = _MethodEnum("Scale", ("NoScaling", "Std", "Span"),
+                              qualname="Scale.ScalingType")
     NoCentering, Mean, Median = CenteringType
     NoScaling, Std, Span = ScalingType
 
diff --git a/Orange/tests/test_preprocess.py b/Orange/tests/test_preprocess.py
index 60f10120f02..d6357abaa88 100644
--- a/Orange/tests/test_preprocess.py
+++ b/Orange/tests/test_preprocess.py
@@ -2,6 +2,7 @@
 # pylint: disable=missing-docstring
 
 import os
+import pickle
 import unittest
 from unittest.mock import Mock, MagicMock, patch
 import numpy as np
@@ -130,3 +131,23 @@ def test_reprs(self):
             repr_str = repr(preproc())
             new_preproc = eval(repr_str)
             self.assertEqual(repr(new_preproc), repr_str)
+
+class TestEnumPickling(unittest.TestCase):
+    def test_continuize_pickling(self):
+        c = Continuize(multinomial_treatment=Continuize.FirstAsBase)
+        s = pickle.dumps(c, -1)
+        c1 = pickle.loads(s)
+        self.assertIs(c1.multinomial_treatment, c.multinomial_treatment)
+
+    def test_randomize_pickling(self):
+        c = Randomize(rand_type=Randomize.RandomizeMetas)
+        s = pickle.dumps(c, -1)
+        c1 = pickle.loads(s)
+        self.assertIs(c1.rand_type, c.rand_type)
+
+    def test_scaling_pickling(self):
+        c = Scale(center=Scale.Median, scale=Scale.Span)
+        s = pickle.dumps(c, -1)
+        c1 = pickle.loads(s)
+        self.assertIs(c1.center, c.center)
+        self.assertIs(c1.scale, c.scale)