Merge 3.4

This commit is contained in:
Éric Araujo 2014-03-17 16:50:35 -04:00
commit 42867c73c9
1 changed files with 2 additions and 2 deletions

View File

@ -934,8 +934,8 @@ After the `MagicMock` has been used we can use attributes like
the magic methods you specifically want: the magic methods you specifically want:
>>> mock = Mock() >>> mock = Mock()
>>> mock.__setitem__ = Mock(side_effect=getitem) >>> mock.__getitem__ = Mock(side_effect=getitem)
>>> mock.__getitem__ = Mock(side_effect=setitem) >>> mock.__setitem__ = Mock(side_effect=setitem)
A *third* option is to use `MagicMock` but passing in `dict` as the `spec` A *third* option is to use `MagicMock` but passing in `dict` as the `spec`
(or `spec_set`) argument so that the `MagicMock` created only has (or `spec_set`) argument so that the `MagicMock` created only has