merge 3.3-slp (Stackless python#128, pickling of module stackless)

akruis · Apr 14, 2017 · ca4b16a · ca4b16a
2 parents 43b9010 + 2aa8771
commit ca4b16a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Lib/stackless.py b/Lib/stackless.py
@@ -18,7 +18,7 @@
 
 def __reduce__():
     return "stackless"
-def __reduce_ex_(*args):
+def __reduce_ex__(*args):
     return "stackless"
 
 # Backwards support for unpickling older pickles, even from 2.7

diff --git a/Stackless/changelog.txt b/Stackless/changelog.txt
@@ -9,6 +9,9 @@ What's New in Stackless 3.X.X?
 
 *Release date: 20XX-XX-XX*
 
+- https://bitbucket.org/stackless-dev/stackless/issues/128
+  Fix pickling of the module 'stackless'.
+
 - https://bitbucket.org/stackless-dev/stackless/issues/127
   Disable the Stackless specific code for pickling 'iterator' and
   'callable_iterator' objects. C-Python 3.3 already pickles them.

diff --git a/Stackless/unittests/test_pickle.py b/Stackless/unittests/test_pickle.py
@@ -654,6 +654,10 @@ def _test(self, obj, *attributes, **kw):
             # refer to the same objects
             self.assertIs(value_c, value_obj)
 
+    def test_module_stackless(self):
+        # test for issue 128
+        self.assertIs(stackless, copy.copy(stackless))
+
     def test_code(self):
         def f():
             pass