From 0dccf657b5112ad3fb11250ac8f9a70a89ea0c07 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Sun, 25 Mar 2012 19:11:50 +0100 Subject: Minor changes to the unittest.mock.mock_open helper --- Lib/unittest/mock.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index a0b7fb0..1c7f33a 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -2141,7 +2141,8 @@ FunctionAttributes = set([ file_spec = None -def mock_open(mock=None, read_data=None): + +def mock_open(mock=None, read_data=''): """ A helper function to create a mock to replace the use of `open`. It works for `open` called directly or used as a context manager. @@ -2159,14 +2160,12 @@ def mock_open(mock=None, read_data=None): file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO)))) if mock is None: - mock = MagicMock(spec=file_spec) + mock = MagicMock(name='open', spec=open) handle = MagicMock(spec=file_spec) handle.write.return_value = None handle.__enter__.return_value = handle - - if read_data is not None: - handle.read.return_value = read_data + handle.read.return_value = read_data mock.return_value = handle return mock -- cgit v0.12