Commit 4769db6b authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #20321 -- Added missing key name in MergeDict KeyError message 

Thanks mark.harviston et gmail.com for the report.
parent 6bccbc05

django/utils/datastructures.py

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class MergeDict(object): 
                return dict_[key]

            except KeyError:

                pass

        raise KeyError

        raise KeyError(key)



    def __copy__(self):

        return self.__class__(*self.dicts)

tests/utils_tests/test_datastructures.py

+8 −0
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ class MergeDictTests(SimpleTestCase): 
        self.assertFalse(empty)

        self.assertTrue(not_empty)



    def test_key_error(self):

        """

        Test that the message of KeyError contains the missing key name.

        """

        d1 = MergeDict({'key1': 42})

        with six.assertRaisesRegex(self, KeyError, 'key2'):

            d1['key2']





class MultiValueDictTests(SimpleTestCase):