Skip to content

Small refactor #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2020
Merged

Small refactor #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions mocket/mocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down