Remove dill from dependencies

Orange/__init__.py

@@ -1,13 +1,3 @@
-import pickle
-from unittest.mock import patch
-# Needed because the pure-Python Unpickler that dill uses can also fail
-# with struct.error Exception. This seems to work, side effects unknown.
-with patch('pickle._Unpickler', pickle.Unpickler):
-    import dill
-dill.settings['protocol'] = pickle.HIGHEST_PROTOCOL
-dill.settings['recurse'] = True
-dill.settings['byref'] = True
-
 from .misc.lazy_module import _LazyModule
 from .misc.datasets import _DatasetInfo
 from .version import \

Orange/widgets/data/tests/test_owfeatureconstructor.py

@@ -20,8 +20,6 @@
     freevars, validate_exp, FeatureFunc
 )
 
-import dill  # Import dill after Orange because patched
-
 
 class FeatureConstructorTest(unittest.TestCase):
     def test_construct_variables_discrete(self):
@@ -93,27 +91,6 @@ def test_construct_numeric_names(self):
         ContinuousVariable._clear_all_caches()
 
 
-GLOBAL_CONST = 2
-
-
-class PicklingTest(unittest.TestCase):
-    CLASS_CONST = 3
-
-    def test_lambdas_pickle(self):
-        NONLOCAL_CONST = 5
-
-        lambda_func = lambda x, local_const=7: \
-            x * local_const * NONLOCAL_CONST * self.CLASS_CONST * GLOBAL_CONST
-
-        def nested_func(x, local_const=7):
-            return x * local_const * NONLOCAL_CONST * self.CLASS_CONST * GLOBAL_CONST
-
-        self.assertEqual(lambda_func(11),
-                         dill.loads(dill.dumps(lambda_func))(11))
-        self.assertEqual(nested_func(11),
-                         dill.loads(dill.dumps(nested_func))(11))
-
-
 class TestTools(unittest.TestCase):
     def test_free_vars(self):
         stmt = ast.parse("foo", "", "single")

Orange/widgets/model/owloadmodel.py

@@ -1,6 +1,6 @@
 import os
+import pickle
 
-import dill as pickle
 from AnyQt.QtCore import QTimer
 from AnyQt.QtWidgets import (
     QSizePolicy, QHBoxLayout, QComboBox, QStyle, QFileDialog

Orange/widgets/model/owsavemodel.py

@@ -1,6 +1,7 @@
 import os
 
-import dill as pickle
+import pickle
+
 from AnyQt.QtWidgets import (
     QComboBox, QStyle, QSizePolicy, QFileDialog, QApplication
 )

Orange/widgets/model/tests/test_owloadmodel.py

@@ -4,8 +4,6 @@
 import pickle
 from tempfile import mkstemp
 
-import dill    # Import dill after Orange because patched
-
 from Orange.classification.majority import ConstantModel
 from Orange.widgets.model.owloadmodel import OWLoadModel
 from Orange.widgets.tests.base import WidgetTest
@@ -23,11 +21,10 @@ def test_show_error(self):
         fd, fname = mkstemp(suffix='.pkcls')
         os.close(fd)
         try:
-            for pickle_impl in (pickle, dill):
-                with open(fname, 'wb') as f:
-                    pickle_impl.dump(clsf, f)
-                self.widget.load(fname)
-                self.assertFalse(self.widget.Error.load_error.is_shown())
+            with open(fname, 'wb') as f:
+                pickle.dump(clsf, f)
+            self.widget.load(fname)
+            self.assertFalse(self.widget.Error.load_error.is_shown())
 
             with open(fname, "w") as f:
                 f.write("X")

conda-recipe/meta.yaml

@@ -48,7 +48,6 @@ requirements:
     - anyqt         >=0.0.6
     - joblib
     - python.app    # [osx]
-    - dill          # pickle anything
     - commonmark
     - serverfiles
 

requirements-core.txt

@@ -11,6 +11,5 @@ chardet>=3.0.2
 joblib>=0.9.4
 keyring
 keyrings.alt    # for alternative keyring implementations
-dill
 setuptools>=36.3
 serverfiles		# for Data Sets synchronization

scripts/macos/requirements.txt

@@ -7,7 +7,6 @@
 AnyQt==0.0.8
 Bottleneck==1.2.0
 chardet==3.0.4
-dill==0.2.6
 docutils==0.13.1
 joblib==0.11
 keyring==10.3.1

scripts/windows/specs/PY34-win32.txt

@@ -18,7 +18,6 @@ AnyQt==0.0.8
 PyQt5==5.5.1
 docutils==0.13.1
 pip==9.0.1
-dill==0.2.6
 pyqtgraph==0.10.0
 six==1.10.0
 xlrd==1.0.0