(original) (raw)

changeset: 85074:4db3d3d5815c parent: 85071:328b1a29102c parent: 85073:8b557ef46d7c user: Ezio Melotti ezio.melotti@gmail.com date: Thu Aug 08 20:12:57 2013 +0300 files: Misc/ACKS Misc/NEWS description: #18357: merge with 3.3. diff -r 328b1a29102c -r 4db3d3d5815c Lib/test/test_dictviews.py --- a/Lib/test/test_dictviews.py Thu Aug 08 19:37:52 2013 +0300 +++ b/Lib/test/test_dictviews.py Thu Aug 08 20:12:57 2013 +0300 @@ -112,6 +112,13 @@ self.assertEqual(d1.keys() ^ set(d3.keys()), {'a', 'b', 'd', 'e'}) + self.assertEqual(d1.keys() - d1.keys(), set()) + self.assertEqual(d1.keys() - d2.keys(), {'a'}) + self.assertEqual(d1.keys() - d3.keys(), {'a', 'b'}) + self.assertEqual(d1.keys() - set(d1.keys()), set()) + self.assertEqual(d1.keys() - set(d2.keys()), {'a'}) + self.assertEqual(d1.keys() - set(d3.keys()), {'a', 'b'}) + self.assertFalse(d1.keys().isdisjoint(d1.keys())) self.assertFalse(d1.keys().isdisjoint(d2.keys())) self.assertFalse(d1.keys().isdisjoint(list(d2.keys()))) @@ -162,6 +169,13 @@ self.assertEqual(d1.items() ^ d3.items(), {('a', 1), ('b', 2), ('d', 4), ('e', 5)}) + self.assertEqual(d1.items() - d1.items(), set()) + self.assertEqual(d1.items() - d2.items(), {('a', 1)}) + self.assertEqual(d1.items() - d3.items(), {('a', 1), ('b', 2)}) + self.assertEqual(d1.items() - set(d1.items()), set()) + self.assertEqual(d1.items() - set(d2.items()), {('a', 1)}) + self.assertEqual(d1.items() - set(d3.items()), {('a', 1), ('b', 2)}) + self.assertFalse(d1.items().isdisjoint(d1.items())) self.assertFalse(d1.items().isdisjoint(d2.items())) self.assertFalse(d1.items().isdisjoint(list(d2.items()))) diff -r 328b1a29102c -r 4db3d3d5815c Misc/ACKS --- a/Misc/ACKS Thu Aug 08 19:37:52 2013 +0300 +++ b/Misc/ACKS Thu Aug 08 20:12:57 2013 +0300 @@ -1290,6 +1290,7 @@ Stephen Turner Theodore Turocy Bill Tutt +Fraser Tweedale Doobee R. Tzeck Eren Türkay Lionel Ulmer diff -r 328b1a29102c -r 4db3d3d5815c Misc/NEWS --- a/Misc/NEWS Thu Aug 08 19:37:52 2013 +0300 +++ b/Misc/NEWS Thu Aug 08 20:12:57 2013 +0300 @@ -350,6 +350,9 @@ when \r\n appears at end of 65535 bytes without other newlines. - Issue #18076: Introduce importlib.util.decode_source(). +- Issue #18357: add tests for dictview set difference. + Patch by Fraser Tweedale. + - importlib.abc.SourceLoader.get_source() no longer changes SyntaxError or UnicodeDecodeError into ImportError. /ezio.melotti@gmail.com