Merge 3.5 (Issue #19235)

diff --cc Lib/test/test_dictviews.py
index d96832e57630e07e3938112a0d07f1e3547bc162,8d33801ca094b6ae0fbf806218392e06003392a2..fcb6814b54206d6a78e0c8a5a9379ba1039940fb
--- 1/Lib/test/test_dictviews.py
--- 2/Lib/test/test_dictviews.py
+++ b/Lib/test/test_dictviews.py
@@@ -196,29 -195,8 +196,29 @@@ class DictSetTest(unittest.TestCase)
      def test_recursive_repr(self):
          d = {}
          d[42] = d.values()
-         self.assertRaises(RuntimeError, repr, d)
+         self.assertRaises(RecursionError, repr, d)
  
 +    def test_abc_registry(self):
 +        d = dict(a=1)
 +
 +        self.assertIsInstance(d.keys(), collections.KeysView)
 +        self.assertIsInstance(d.keys(), collections.MappingView)
 +        self.assertIsInstance(d.keys(), collections.Set)
 +        self.assertIsInstance(d.keys(), collections.Sized)
 +        self.assertIsInstance(d.keys(), collections.Iterable)
 +        self.assertIsInstance(d.keys(), collections.Container)
 +
 +        self.assertIsInstance(d.values(), collections.ValuesView)
 +        self.assertIsInstance(d.values(), collections.MappingView)
 +        self.assertIsInstance(d.values(), collections.Sized)
 +
 +        self.assertIsInstance(d.items(), collections.ItemsView)
 +        self.assertIsInstance(d.items(), collections.MappingView)
 +        self.assertIsInstance(d.items(), collections.Set)
 +        self.assertIsInstance(d.items(), collections.Sized)
 +        self.assertIsInstance(d.items(), collections.Iterable)
 +        self.assertIsInstance(d.items(), collections.Container)
 +
  
  if __name__ == "__main__":
      unittest.main()

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/_sre.c
Simple merge