Skip to content

Commit

Permalink
bpo-43232: Remove previously deprecated methods on TransportSocket (G…
Browse files Browse the repository at this point in the history
  • Loading branch information
illia-v authored Jun 30, 2021
1 parent e2fea10 commit 1d08d85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 108 deletions.
108 changes: 0 additions & 108 deletions Lib/asyncio/trsock.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import socket
import warnings


class TransportSocket:
Expand All @@ -16,13 +15,6 @@ class TransportSocket:
def __init__(self, sock: socket.socket):
self._sock = sock

def _na(self, what):
warnings.warn(
f"Using {what} on sockets returned from get_extra_info('socket') "
f"will be prohibited in asyncio 3.9. Please report your use case "
f"to bugs.python.org.",
DeprecationWarning, source=self)

@property
def family(self):
return self._sock.family
Expand Down Expand Up @@ -90,98 +82,6 @@ def getsockname(self):
def getsockbyname(self):
return self._sock.getsockbyname()

def accept(self):
self._na('accept() method')
return self._sock.accept()

def connect(self, *args, **kwargs):
self._na('connect() method')
return self._sock.connect(*args, **kwargs)

def connect_ex(self, *args, **kwargs):
self._na('connect_ex() method')
return self._sock.connect_ex(*args, **kwargs)

def bind(self, *args, **kwargs):
self._na('bind() method')
return self._sock.bind(*args, **kwargs)

def ioctl(self, *args, **kwargs):
self._na('ioctl() method')
return self._sock.ioctl(*args, **kwargs)

def listen(self, *args, **kwargs):
self._na('listen() method')
return self._sock.listen(*args, **kwargs)

def makefile(self):
self._na('makefile() method')
return self._sock.makefile()

def sendfile(self, *args, **kwargs):
self._na('sendfile() method')
return self._sock.sendfile(*args, **kwargs)

def close(self):
self._na('close() method')
return self._sock.close()

def detach(self):
self._na('detach() method')
return self._sock.detach()

def sendmsg_afalg(self, *args, **kwargs):
self._na('sendmsg_afalg() method')
return self._sock.sendmsg_afalg(*args, **kwargs)

def sendmsg(self, *args, **kwargs):
self._na('sendmsg() method')
return self._sock.sendmsg(*args, **kwargs)

def sendto(self, *args, **kwargs):
self._na('sendto() method')
return self._sock.sendto(*args, **kwargs)

def send(self, *args, **kwargs):
self._na('send() method')
return self._sock.send(*args, **kwargs)

def sendall(self, *args, **kwargs):
self._na('sendall() method')
return self._sock.sendall(*args, **kwargs)

def set_inheritable(self, *args, **kwargs):
self._na('set_inheritable() method')
return self._sock.set_inheritable(*args, **kwargs)

def share(self, process_id):
self._na('share() method')
return self._sock.share(process_id)

def recv_into(self, *args, **kwargs):
self._na('recv_into() method')
return self._sock.recv_into(*args, **kwargs)

def recvfrom_into(self, *args, **kwargs):
self._na('recvfrom_into() method')
return self._sock.recvfrom_into(*args, **kwargs)

def recvmsg_into(self, *args, **kwargs):
self._na('recvmsg_into() method')
return self._sock.recvmsg_into(*args, **kwargs)

def recvmsg(self, *args, **kwargs):
self._na('recvmsg() method')
return self._sock.recvmsg(*args, **kwargs)

def recvfrom(self, *args, **kwargs):
self._na('recvfrom() method')
return self._sock.recvfrom(*args, **kwargs)

def recv(self, *args, **kwargs):
self._na('recv() method')
return self._sock.recv(*args, **kwargs)

def settimeout(self, value):
if value == 0:
return
Expand All @@ -196,11 +96,3 @@ def setblocking(self, flag):
return
raise ValueError(
'setblocking(): transport sockets cannot be blocking')

def __enter__(self):
self._na('context manager protocol')
return self._sock.__enter__()

def __exit__(self, *err):
self._na('context manager protocol')
return self._sock.__exit__(*err)
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Prohibit previously deprecated potentially disruptive operations on
:class:`asyncio.trsock.TransportSocket`. Patch by Illia Volochii.

1 comment on commit 1d08d85

@jnsnow
Copy link

@jnsnow jnsnow commented on 1d08d85 Sep 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, is there some "safe" way to transmit ancillary data, then? I had been using asyncio but using this interface to send SCM_RIGHTS messages via send_msg. What should I be doing instead ...?

Also, today I learned I have not been seeing depreciation warnings 😔

Please sign in to comment.