diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2015-08-06 10:15:51 (GMT) |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2015-08-06 10:15:51 (GMT) |
commit | 86b34da5ef249b865281704a5f6721391edb0c1c (patch) | |
tree | 41a24e383eb516446c85551e98ecf4d113e47e74 /Lib/unittest/mock.py | |
parent | 0b2833eaf2f21f0d70cee07eea39e139fd5ce1ef (diff) | |
download | cpython-86b34da5ef249b865281704a5f6721391edb0c1c.zip cpython-86b34da5ef249b865281704a5f6721391edb0c1c.tar.gz cpython-86b34da5ef249b865281704a5f6721391edb0c1c.tar.bz2 |
Issue #23004: mock_open() now reads binary data correctly when the type of read_data is bytes.
Initial patch by Aaron Hill.
Diffstat (limited to 'Lib/unittest/mock.py')
-rw-r--r-- | Lib/unittest/mock.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 3fbe846..ec3f2f9 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -2250,9 +2250,10 @@ def _iterate_read_data(read_data): # Helper for mock_open: # Retrieve lines from read_data via a generator so that separate calls to # readline, read, and readlines are properly interleaved - data_as_list = ['{}\n'.format(l) for l in read_data.split('\n')] + sep = b'\n' if isinstance(read_data, bytes) else '\n' + data_as_list = [l + sep for l in read_data.split(sep)] - if data_as_list[-1] == '\n': + if data_as_list[-1] == sep: # If the last line ended in a newline, the list comprehension will have an # extra entry that's just a newline. Remove this. data_as_list = data_as_list[:-1] @@ -2286,7 +2287,7 @@ def mock_open(mock=None, read_data=''): def _read_side_effect(*args, **kwargs): if handle.read.return_value is not None: return handle.read.return_value - return ''.join(_state[0]) + return type(read_data)().join(_state[0]) def _readline_side_effect(): if handle.readline.return_value is not None: |