Simplify and improve performance of __reduce__

Author: grantjenks

sortedcontainers/sorteddict.py

@@ -572,7 +572,8 @@ def __reduce__(self):
         :func:`SortedDict.__init__` confuse pickle so customize the reducer.
 
         """
-        return (self.__class__, (self._key, list(self.items())))
+        items = dict.copy(self)
+        return (type(self), (self._key, items))
 
 
     @recursive_repr()

sortedcontainers/sortedlist.py

@@ -1580,6 +1580,11 @@ def comparer(self, other):
     __make_cmp = staticmethod(__make_cmp)
 
 
+    def __reduce__(self):
+        values = reduce(iadd, self._lists, [])
+        return (type(self), (values,))
+
+
     @recursive_repr()
     def __repr__(self):
         """Return string representation of sorted list.
@@ -2526,6 +2531,11 @@ def __mul__(self, num):
         return self.__class__(values, key=self._key)
 
 
+    def __reduce__(self):
+        values = reduce(iadd, self._lists, [])
+        return (type(self), (values, self.key))
+
+
     @recursive_repr()
     def __repr__(self):
         """Return string representation of sorted-key list.

sortedcontainers/sortedset.py

@@ -702,7 +702,7 @@ def __reduce__(self):
         confuse pickle so customize the reducer.
 
         """
-        return (type(self), (self._set, self._key))
+        return (type(self)._fromset, (self._set, self._key))
 
 
     @recursive_repr()

tests/test_coverage_sortedkeylist_negate.py

@@ -597,7 +597,8 @@ def test_pickle():
     beta = pickle.loads(pickle.dumps(alpha))
     assert alpha == beta
     assert alpha._key == beta._key
-    assert alpha._load == beta._load
+    assert alpha._load == 500
+    assert beta._load == 1000
 
 def test_check():
     slt = SortedKeyList(range(10), key=negate)

tests/test_coverage_sortedlist.py

@@ -589,7 +589,8 @@ def test_pickle():
     alpha._reset(500)
     beta = pickle.loads(pickle.dumps(alpha))
     assert alpha == beta
-    assert alpha._load == beta._load
+    assert alpha._load == 500
+    assert beta._load == 1000
 
 def test_build_index():
     slt = SortedList([0])