diff --git a/Makefile b/Makefile index c24c610a..b910a6c8 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ publish: install-test-requirements anaconda upload dist/mocket-$(shell python -c 'import mocket; print(mocket.__version__)').tar.gz clean: - rm -rf *.egg-info + rm -rf *.egg-info dist/ find . -type d -name __pycache__ -exec rm -rf {} \; .PHONY: clean publish safetest test develop lint-python test-python install-test-requirements install-dev-requirements diff --git a/mocket/mocket.py b/mocket/mocket.py index 82a55dbd..64cc6dfe 100644 --- a/mocket/mocket.py +++ b/mocket/mocket.py @@ -271,10 +271,9 @@ def recv_into(self, buffer, buffersize=None, flags=None): def recv(self, buffersize, flags=None): if Mocket.r_fd and Mocket.w_fd: return os.read(Mocket.r_fd, buffersize) - if self.fd: - data = self.read(buffersize) - if data: - return data + data = self.read(buffersize) + if data: + return data # used by Redis mock exc = BlockingIOError() exc.errno = errno.EWOULDBLOCK