merge 3.5-slp (Stackless #112, fix pickle/copy tests)

Author: Anselm Kruis

Lib/test/test_dictviews.py

@@ -2,6 +2,7 @@
 import copy
 import pickle
 import unittest
+import test.support
 
 class DictSetTest(unittest.TestCase):
 
@@ -200,12 +201,14 @@ def test_recursive_repr(self):
         d[42] = d.values()
         self.assertRaises(RecursionError, repr, d)
 
+    @unittest.skipIf(test.support.stackless, "Stackless can copy dictviews")
     def test_copy(self):
         d = {1: 10, "a": "ABC"}
         self.assertRaises(TypeError, copy.copy, d.keys())
         self.assertRaises(TypeError, copy.copy, d.values())
         self.assertRaises(TypeError, copy.copy, d.items())
 
+    @unittest.skipIf(test.support.stackless, "Stackless can pickle dictviews")
     def test_pickle(self):
         d = {1: 10, "a": "ABC"}
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):

Lib/test/test_generators.py

@@ -113,13 +113,15 @@ def func():
         self.assertEqual(gen.__qualname__,
                          "GeneratorTest.test_name.<locals>.<genexpr>")
 
+    @unittest.skipIf(support.stackless, "Stackless can copy generators")
     def test_copy(self):
         def f():
             yield 1
         g = f()
         with self.assertRaises(TypeError):
             copy.copy(g)
 
+    @unittest.skipIf(support.stackless, "Stackless can pickle generators")
     def test_pickle(self):
         def f():
             yield 1

Lib/test/test_xml_etree.py

@@ -2137,12 +2137,14 @@ def test_iter_by_tag(self):
         self.assertEqual(self._ilist(doc), all_tags)
         self.assertEqual(self._ilist(doc, '*'), all_tags)
 
+    @unittest.skipIf(support.stackless, "Stackless can copy iterators")
     def test_copy(self):
         a = ET.Element('a')
         it = a.iter()
         with self.assertRaises(TypeError):
             copy.copy(it)
 
+    @unittest.skipIf(support.stackless, "Stackless can pickle iterators")
     def test_pickle(self):
         a = ET.Element('a')
         it = a.iter()