mirror of
https://github.com/python/cpython.git
synced 2025-08-01 15:43:13 +00:00
Issue 12717: Fix-up an earlier backport in ConfigParser.
This commit is contained in:
parent
d7fbc8bf12
commit
3ea5224c43
2 changed files with 23 additions and 1 deletions
|
@ -570,7 +570,7 @@ class _Chainmap(_UserDict.DictMixin):
|
||||||
def keys(self):
|
def keys(self):
|
||||||
result = []
|
result = []
|
||||||
seen = set()
|
seen = set()
|
||||||
for mapping in self_maps:
|
for mapping in self._maps:
|
||||||
for key in mapping:
|
for key in mapping:
|
||||||
if key not in seen:
|
if key not in seen:
|
||||||
result.append(key)
|
result.append(key)
|
||||||
|
|
|
@ -529,6 +529,27 @@ class SafeConfigParserTestCase(ConfigParserTestCase):
|
||||||
class SafeConfigParserTestCaseNoValue(SafeConfigParserTestCase):
|
class SafeConfigParserTestCaseNoValue(SafeConfigParserTestCase):
|
||||||
allow_no_value = True
|
allow_no_value = True
|
||||||
|
|
||||||
|
class TestChainMap(unittest.TestCase):
|
||||||
|
def test_issue_12717(self):
|
||||||
|
d1 = dict(red=1, green=2)
|
||||||
|
d2 = dict(green=3, blue=4)
|
||||||
|
dcomb = d2.copy()
|
||||||
|
dcomb.update(d1)
|
||||||
|
cm = ConfigParser._Chainmap(d1, d2)
|
||||||
|
self.assertIsInstance(cm.keys(), list)
|
||||||
|
self.assertEqual(set(cm.keys()), set(dcomb.keys())) # keys()
|
||||||
|
self.assertEqual(set(cm.values()), set(dcomb.values())) # values()
|
||||||
|
self.assertEqual(set(cm.items()), set(dcomb.items())) # items()
|
||||||
|
self.assertEqual(set(cm), set(dcomb)) # __iter__ ()
|
||||||
|
self.assertEqual(cm, dcomb) # __eq__()
|
||||||
|
self.assertEqual([cm[k] for k in dcomb], dcomb.values()) # __getitem__()
|
||||||
|
klist = 'red green blue black brown'.split()
|
||||||
|
self.assertEqual([cm.get(k, 10) for k in klist],
|
||||||
|
[dcomb.get(k, 10) for k in klist]) # get()
|
||||||
|
self.assertEqual([k in cm for k in klist],
|
||||||
|
[k in dcomb for k in klist]) # __contains__()
|
||||||
|
self.assertEqual([cm.has_key(k) for k in klist],
|
||||||
|
[dcomb.has_key(k) for k in klist]) # has_key()
|
||||||
|
|
||||||
class Issue7005TestCase(unittest.TestCase):
|
class Issue7005TestCase(unittest.TestCase):
|
||||||
"""Test output when None is set() as a value and allow_no_value == False.
|
"""Test output when None is set() as a value and allow_no_value == False.
|
||||||
|
@ -591,6 +612,7 @@ def test_main():
|
||||||
SafeConfigParserTestCaseNoValue,
|
SafeConfigParserTestCaseNoValue,
|
||||||
SortedTestCase,
|
SortedTestCase,
|
||||||
Issue7005TestCase,
|
Issue7005TestCase,
|
||||||
|
TestChainMap,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue