From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 30 May 2015 18:00:05 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ef8958e4022df5f14a8cfd57dec39e218a0f554;p=python

Merge from 3.5.
---

3ef8958e4022df5f14a8cfd57dec39e218a0f554
diff --cc Lib/test/test_collections.py
index c6db13ecfb,3f02129c1d..5836cb37ea
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@@ -1965,14 -1978,6 +1978,13 @@@ class OrderedDictTests
          od = OrderedDict(**d)
          self.assertGreater(sys.getsizeof(od), sys.getsizeof(d))
  
 +    def test_views(self):
-         OrderedDict = self.module.OrderedDict
 +        # See http://bugs.python.org/issue24286
 +        s = 'the quick brown fox jumped over a lazy dog yesterday before dawn'.split()
 +        od = OrderedDict.fromkeys(s)
 +        self.assertEqual(od.keys(), dict(od).keys())
 +        self.assertEqual(od.items(), dict(od).items())
 +
      def test_override_update(self):
          OrderedDict = self.module.OrderedDict
          # Verify that subclasses can override update() without breaking __init__()