bpo-31855: unittest.mock.mock_open() results now respects the argument of read([size]) #11521
Conversation
remilapeyre
changed the title
Lib/unittest/mock.py
Outdated
| @@ -2426,7 +2432,10 @@ def _iter_side_effect(): | |||
| handle.__iter__.side_effect = _iter_side_effect | |||
|
|
|||
| def reset_data(*args, **kwargs): | |||
| _state[0] = _iterate_read_data(read_data) | |||
| if isinstance(read_data, bytes): | |||
There was a problem hiding this comment.
Might be good to get a function for this. Something like "_read_data_to_stream" to remove duplication.
Misc/NEWS.d/next/Library/2019-01-11-17-09-15.bpo-31855.PlhfsX.rst
Outdated
Show resolved
Hide resolved
Co-Authored-By: remilapeyre <remi.lapeyre@henki.fr>
| for line in data_as_list: | ||
| yield line | ||
| def _to_stream(read_data): | ||
| if isinstance(read_data, bytes): |
There was a problem hiding this comment.
Code LGTM. I am slightly concerned if there might be any problems with backport where in Python 2 bytes is like an alias for str. So, even with BytesIO it would still be string as shown below and work as expected. Maybe I am just overthinking this.
It would be helpful if @cjw296 and @voidspace can review this since this is a good bug to be fixed. Thanks @remilapeyre .
$ python2
Python 2.7.6 (default, Sep 9 2014, 15:04:36)
[GCC 4.2.1 Compatible Apple LLVM 6.0 (clang-600.0.39)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> isinstance('a', bytes)
True
>>> isinstance(b'a', str)
True
>>> import io
>>> io.BytesIO('a').readline()
'a'
>>> type(io.BytesIO('a').readline())
<type 'str'>
There was a problem hiding this comment.
Don't worry, we can make this work in the backport :-)
There was a problem hiding this comment.
@tirkarthi wouldn't it still be correct? The test would be useless be the mock would still work right?
There was a problem hiding this comment.
yes, in Python 2 str and bytes are the same. I will just keep on the CI once the backport lands in mock repo.
|
Thanks @remilapeyre for the PR, and @cjw296 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7. |
…t of read([size]) (pythonGH-11521) unittest.mock.mock_open() results now respects the argument of read([size]) Co-Authored-By: remilapeyre <remi.lapeyre@henki.fr> (cherry picked from commit 11a8832) Co-authored-by: Rémi Lapeyre <remi.lapeyre@henki.fr>
|
GH-13152 is a backport of this pull request to the 3.7 branch. |
* master: (1204 commits) bpo-31855: unittest.mock.mock_open() results now respects the argument of read([size]) (pythonGH-11521) Forbid creating of stream objects outside of asyncio (python#13101) bpo-35925: Skip SSL tests that fail due to weak external certs. (pythonGH-13124) Fix rst formatting for several links in ssl documentation (pythonGH-13133) bpo-36542: Allow to overwrite the signature for Python functions. (pythonGH-12705) bpo-36793: Remove unneeded __str__ definitions. (pythonGH-13081) bpo-36766: Typos in docs and code comments (pythonGH-13116) bpo-36275: enhance documentation for venv.create() (pythonGH-13114) Clarify the download unit in the download section (pythonGH-13122) bpo-30668: add missing word in license.rst (pythonGH-13115) Unroll import-team in CODEOWNERS (python#13118) bpo-36594: Fix incorrect use of %p in format strings (pythonGH-12769) bpo-36798: Updating f-string docs for := use case (pythonGH-13107) Update wsgiref.rst (python#10488) Doc/c-api/exceptions.rst: fix grammar (python#12091) bpo-36811: Fix a C compiler warning in _elementtree.c. (pythonGH-13109) Only count number of members once (python#12691) bpo-16024: Doc cleanup regarding path_fd, dir_fd, follow_symlinks (pythonGH-5505) bpo-36791: Safer detection of integer overflow in sum(). (pythonGH-13080) bpo-33530: Implement Happy Eyeballs in asyncio, v2 (pythonGH-7237) ...
|
Also in 3.0.5 of the back port: testing-cabal/mock@225d977 |
https://bugs.python.org/issue31855