diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-03-04 06:10:52 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-03-04 06:10:52 (GMT) |
commit | 0f04bc79592f2cea68fd7153b792910bf3527bf5 (patch) | |
tree | 3506ccd7e9780c0461bbec42880a2dce6d24060c /Lib/test/test_dictviews.py | |
parent | 998f7d719b6ffccc3bb8955fc5b6870b3665146c (diff) | |
parent | cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42 (diff) | |
download | cpython-0f04bc79592f2cea68fd7153b792910bf3527bf5.zip cpython-0f04bc79592f2cea68fd7153b792910bf3527bf5.tar.gz cpython-0f04bc79592f2cea68fd7153b792910bf3527bf5.tar.bz2 |
merge 3.5 (closes #26478)
Diffstat (limited to 'Lib/test/test_dictviews.py')
-rw-r--r-- | Lib/test/test_dictviews.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py index 245f8c8..4c290ff 100644 --- a/Lib/test/test_dictviews.py +++ b/Lib/test/test_dictviews.py @@ -97,6 +97,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() & set(d1.keys()), {'a', 'b'}) self.assertEqual(d1.keys() & set(d2.keys()), {'b'}) self.assertEqual(d1.keys() & set(d3.keys()), set()) + self.assertEqual(d1.keys() & tuple(d1.keys()), {'a', 'b'}) self.assertEqual(d1.keys() | d1.keys(), {'a', 'b'}) self.assertEqual(d1.keys() | d2.keys(), {'a', 'b', 'c'}) @@ -105,6 +106,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() | set(d2.keys()), {'a', 'b', 'c'}) self.assertEqual(d1.keys() | set(d3.keys()), {'a', 'b', 'd', 'e'}) + self.assertEqual(d1.keys() | (1, 2), {'a', 'b', 1, 2}) self.assertEqual(d1.keys() ^ d1.keys(), set()) self.assertEqual(d1.keys() ^ d2.keys(), {'a', 'c'}) @@ -113,6 +115,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() ^ set(d2.keys()), {'a', 'c'}) self.assertEqual(d1.keys() ^ set(d3.keys()), {'a', 'b', 'd', 'e'}) + self.assertEqual(d1.keys() ^ tuple(d2.keys()), {'a', 'c'}) self.assertEqual(d1.keys() - d1.keys(), set()) self.assertEqual(d1.keys() - d2.keys(), {'a'}) @@ -120,6 +123,7 @@ class DictSetTest(unittest.TestCase): 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.assertEqual(d1.keys() - (0, 1), {'a', 'b'}) self.assertFalse(d1.keys().isdisjoint(d1.keys())) self.assertFalse(d1.keys().isdisjoint(d2.keys())) |