Skip to content

loop.sock_sendall() and loop.sock_recv() now accept a flags argument #1

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

Open
wallefan wants to merge 4 commits into
base: master
Choose a base branch
from
Open

loop.sock_sendall() and loop.sock_recv() now accept a flags argument #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dd5429
Update selector_events.py
wallefan Dec 22, 2017
302151b
Update events.py
wallefan Dec 22, 2017
daa7849
Should I undo the changes made to this file then do them again?
wallefan Dec 22, 2017
0baa164
Update proactor_events.py
wallefan Dec 22, 2017
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
4 changes: 2 additions & 2 deletions Lib/asyncio/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,10 @@ def remove_writer(self, fd):

# Completion based I/O methods returning Futures.

def sock_recv(self, sock, nbytes):
def sock_recv(self, sock, nbytes, flags=0):
raise NotImplementedError

def sock_sendall(self, sock, data):
def sock_sendall(self, sock, data, flags=0):
raise NotImplementedError

def sock_connect(self, sock, address):
Expand Down
18 changes: 9 additions & 9 deletions Lib/asyncio/selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ def remove_writer(self, fd):
self._ensure_fd_no_transport(fd)
return self._remove_writer(fd)

def sock_recv(self, sock, n):
def sock_recv(self, sock, n, flags=0):
"""Receive data from the socket.

The return value is a bytes object representing the data received.
Expand All @@ -363,10 +363,10 @@ def sock_recv(self, sock, n):
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
fut = self.create_future()
self._sock_recv(fut, False, sock, n)
self._sock_recv(fut, False, sock, n, flags)
return fut

def _sock_recv(self, fut, registered, sock, n):
def _sock_recv(self, fut, registered, sock, n, flags=0):
# _sock_recv() can add itself as an I/O callback if the operation can't
# be done immediately. Don't use it directly, call sock_recv().
fd = sock.fileno()
Expand All @@ -379,15 +379,15 @@ def _sock_recv(self, fut, registered, sock, n):
if fut.cancelled():
return
try:
data = sock.recv(n)
data = sock.recv(n, flags)
except (BlockingIOError, InterruptedError):
self.add_reader(fd, self._sock_recv, fut, True, sock, n)
self.add_reader(fd, self._sock_recv, fut, True, sock, n, flags)
except Exception as exc:
fut.set_exception(exc)
else:
fut.set_result(data)

def sock_sendall(self, sock, data):
def sock_sendall(self, sock, data, flags=0):
"""Send data to the socket.

The socket must be connected to a remote socket. This method continues
Expand All @@ -402,12 +402,12 @@ def sock_sendall(self, sock, data):
raise ValueError("the socket must be non-blocking")
fut = self.create_future()
if data:
self._sock_sendall(fut, False, sock, data)
self._sock_sendall(fut, False, sock, data, flags)
else:
fut.set_result(None)
return fut

def _sock_sendall(self, fut, registered, sock, data):
def _sock_sendall(self, fut, registered, sock, data, flags=0):
fd = sock.fileno()

if registered:
Expand All @@ -416,7 +416,7 @@ def _sock_sendall(self, fut, registered, sock, data):
return

try:
n = sock.send(data)
n = sock.send(data, flags)
except (BlockingIOError, InterruptedError):
n = 0
except Exception as exc:
Expand Down