From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 3 Jul 2015 05:10:11 +0000 (-0400)
Subject: Merge 3.5 (Issue #19235)
X-Git-Tag: v3.6.0a1~2009
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb215e23004af8e8105fae4e132a63b0c25ea47c;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (Issue #19235)
---

bb215e23004af8e8105fae4e132a63b0c25ea47c
diff --cc Lib/test/test_dictviews.py
index d96832e57630,8d33801ca094..fcb6814b5420
--- a/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()