mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#18357: merge with 3.3.

Browse source
This commit is contained in:
Ezio Melotti 2013-08-08 20:12:57 +03:00
commit d119b7beba
3 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_dictviews.py
View file

@ -112,6 +112,13 @@ class DictSetTest(unittest.TestCase):
self.assertEqual(d1.keys() ^ set(d3.keys()), self.assertEqual(d1.keys() ^ set(d3.keys()),
{'a', 'b', 'd', 'e'}) {'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(d1.keys()))
self.assertFalse(d1.keys().isdisjoint(d2.keys())) self.assertFalse(d1.keys().isdisjoint(d2.keys()))
self.assertFalse(d1.keys().isdisjoint(list(d2.keys()))) self.assertFalse(d1.keys().isdisjoint(list(d2.keys())))
@ -162,6 +169,13 @@ class DictSetTest(unittest.TestCase):
self.assertEqual(d1.items() ^ d3.items(), self.assertEqual(d1.items() ^ d3.items(),
{('a', 1), ('b', 2), ('d', 4), ('e', 5)}) {('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(d1.items()))
self.assertFalse(d1.items().isdisjoint(d2.items())) self.assertFalse(d1.items().isdisjoint(d2.items()))
self.assertFalse(d1.items().isdisjoint(list(d2.items()))) self.assertFalse(d1.items().isdisjoint(list(d2.items())))

1
Misc/ACKS
View file

@ -1290,6 +1290,7 @@ David Turner
Stephen Turner Stephen Turner
Theodore Turocy Theodore Turocy
Bill Tutt Bill Tutt
Fraser Tweedale
Doobee R. Tzeck Doobee R. Tzeck
Eren Türkay Eren Türkay
Lionel Ulmer Lionel Ulmer

3
Misc/NEWS
View file

@ -350,6 +350,9 @@ Library
when \r\n appears at end of 65535 bytes without other newlines. when \r\n appears at end of 65535 bytes without other newlines.
- Issue #18076: Introduce importlib.util.decode_source(). - 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 - importlib.abc.SourceLoader.get_source() no longer changes SyntaxError or
UnicodeDecodeError into ImportError. UnicodeDecodeError into ImportError.