Issue python#112: Prepare Stackless 3.5

-  Skip the CPython test case test.test_pickle.*.test_local_lookup_error. This test checks, that pickling of a local function raises an exception. Stackless pickles the function by value.

https://bitbucket.org/stackless-dev/stackless/issues/112

Author: Anselm Kruis

Lib/test/pickletester.py

@@ -403,10 +403,12 @@ def create_dynamic_class(name, bases):
 DATA4 = b'\x80\x02c__builtin__\nxrange\nq\x00K\x00K\x05K\x01\x87q\x01Rq\x02.'
 try:
     import stackless
+    has_stackless = True
     DATA4_SLP = b'\x80\x02cstackless._wrap\nrange\nq\x00K\x00K\x05K\x01\x87q\x01Rq\x02)b.'
-except:
+except ImportError:
+    has_stackless = False
     DATA4_SLP = DATA4
-    
+
 
 # a SimpleCookie() object pickled from 2.x with protocol 2
 DATA5 = (b'\x80\x02cCookie\nSimpleCookie\nq\x00)\x81q\x01U\x03key'
@@ -1332,12 +1334,9 @@ def test_unpickle_from_2x(self):
         loaded = self.loads(DATA3)
         self.assertEqual(loaded, set([1, 2]))
         loaded = self.loads(DATA4_SLP)
-        try:
-            import stackless
-        except ImportError:
+        if not has_stackless:
+            # stackless provides a fake range for unpickling
             self.assertEqual(type(loaded), type(range(0)))
-        else:
-            pass # stackless provides a fake range for unpickling
         self.assertEqual(list(loaded), list(range(5)))
         loaded = self.loads(DATA5)
         self.assertEqual(type(loaded), SimpleCookie)
@@ -1705,6 +1704,8 @@ class Nested(str):
     def test_local_lookup_error(self):
         # Test that whichmodule() errors out cleanly when looking up
         # an assumed globally-reachable object fails.
+        if has_stackless:
+            self.skipTest("Stackless can pickle functions by value")
         def f():
             pass
         # Since the function is local, lookup will fail

Stackless/changelog.txt

@@ -12,6 +12,7 @@ What's New in Stackless 3.X.X?
 - https://bitbucket.org/stackless-dev/stackless/issues/112
   Adapt Stackless to Python 3.5.
   - PyGenObject got two additional fields
+  - Skip the CPython test case test.test_pickle.*.test_local_lookup_error
 
 - https://bitbucket.org/stackless-dev/stackless/issues/111
   Restore the Python ABI function PyGen_New(). Previously Stackless named this