aboutsummaryrefslogtreecommitdiffstats
path: root/yt_dlp/socks.py
diff options
context:
space:
mode:
authorpukkandan <pukkandan.ytdlp@gmail.com>2022-04-11 20:40:28 +0530
committerpukkandan <pukkandan.ytdlp@gmail.com>2022-04-12 05:32:51 +0530
commit86e5f3ed2e6e71eb81ea4c9e26288f16119ffd0c (patch)
tree12558e4c8f24c1a8d16ccb63e2455b26c301285a /yt_dlp/socks.py
parentf9934b96145af8ac5dfdcbf684827aeaea9912a7 (diff)
downloadhypervideo-pre-86e5f3ed2e6e71eb81ea4c9e26288f16119ffd0c.tar.lz
hypervideo-pre-86e5f3ed2e6e71eb81ea4c9e26288f16119ffd0c.tar.xz
hypervideo-pre-86e5f3ed2e6e71eb81ea4c9e26288f16119ffd0c.zip
[cleanup] Upgrade syntax
Using https://github.com/asottile/pyupgrade 1. `__future__` imports and `coding: utf-8` were removed 2. Files were rewritten with `pyupgrade --py36-plus --keep-percent-format` 3. f-strings were cherry-picked from `pyupgrade --py36-plus` Extractors are left untouched (except removing header) to avoid unnecessary merge conflicts
Diffstat (limited to 'yt_dlp/socks.py')
-rw-r--r--yt_dlp/socks.py29
1 files changed, 13 insertions, 16 deletions
diff --git a/yt_dlp/socks.py b/yt_dlp/socks.py
index 5d4adbe72..ffa960e03 100644
--- a/yt_dlp/socks.py
+++ b/yt_dlp/socks.py
@@ -1,8 +1,5 @@
# Public Domain SOCKS proxy protocol implementation
# Adapted from https://gist.github.com/bluec0re/cafd3764412967417fd3
-
-from __future__ import unicode_literals
-
# References:
# SOCKS4 protocol http://www.openssh.com/txt/socks4.protocol
# SOCKS4A protocol http://www.openssh.com/txt/socks4a.protocol
@@ -33,7 +30,7 @@ SOCKS5_USER_AUTH_VERSION = 0x01
SOCKS5_USER_AUTH_SUCCESS = 0x00
-class Socks4Command(object):
+class Socks4Command:
CMD_CONNECT = 0x01
CMD_BIND = 0x02
@@ -42,14 +39,14 @@ class Socks5Command(Socks4Command):
CMD_UDP_ASSOCIATE = 0x03
-class Socks5Auth(object):
+class Socks5Auth:
AUTH_NONE = 0x00
AUTH_GSSAPI = 0x01
AUTH_USER_PASS = 0x02
AUTH_NO_ACCEPTABLE = 0xFF # For server response
-class Socks5AddressType(object):
+class Socks5AddressType:
ATYP_IPV4 = 0x01
ATYP_DOMAINNAME = 0x03
ATYP_IPV6 = 0x04
@@ -61,14 +58,14 @@ class ProxyError(socket.error):
def __init__(self, code=None, msg=None):
if code is not None and msg is None:
msg = self.CODES.get(code) or 'unknown error'
- super(ProxyError, self).__init__(code, msg)
+ super().__init__(code, msg)
class InvalidVersionError(ProxyError):
def __init__(self, expected_version, got_version):
- msg = ('Invalid response version from server. Expected {0:02x} got '
- '{1:02x}'.format(expected_version, got_version))
- super(InvalidVersionError, self).__init__(0, msg)
+ msg = ('Invalid response version from server. Expected {:02x} got '
+ '{:02x}'.format(expected_version, got_version))
+ super().__init__(0, msg)
class Socks4Error(ProxyError):
@@ -98,7 +95,7 @@ class Socks5Error(ProxyError):
}
-class ProxyType(object):
+class ProxyType:
SOCKS4 = 0
SOCKS4A = 1
SOCKS5 = 2
@@ -111,7 +108,7 @@ Proxy = collections.namedtuple('Proxy', (
class sockssocket(socket.socket):
def __init__(self, *args, **kwargs):
self._proxy = None
- super(sockssocket, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def setproxy(self, proxytype, addr, port, rdns=True, username=None, password=None):
assert proxytype in (ProxyType.SOCKS4, ProxyType.SOCKS4A, ProxyType.SOCKS5)
@@ -123,13 +120,13 @@ class sockssocket(socket.socket):
while len(data) < cnt:
cur = self.recv(cnt - len(data))
if not cur:
- raise EOFError('{0} bytes missing'.format(cnt - len(data)))
+ raise EOFError(f'{cnt - len(data)} bytes missing')
data += cur
return data
def _recv_bytes(self, cnt):
data = self.recvall(cnt)
- return compat_struct_unpack('!{0}B'.format(cnt), data)
+ return compat_struct_unpack(f'!{cnt}B', data)
@staticmethod
def _len_and_data(data):
@@ -143,7 +140,7 @@ class sockssocket(socket.socket):
def _resolve_address(self, destaddr, default, use_remote_dns):
try:
return socket.inet_aton(destaddr)
- except socket.error:
+ except OSError:
if use_remote_dns and self._proxy.remote_dns:
return default
else:
@@ -185,7 +182,7 @@ class sockssocket(socket.socket):
auth_methods.append(Socks5Auth.AUTH_USER_PASS)
packet += compat_struct_pack('!B', len(auth_methods))
- packet += compat_struct_pack('!{0}B'.format(len(auth_methods)), *auth_methods)
+ packet += compat_struct_pack(f'!{len(auth_methods)}B', *auth_methods)
self.sendall(packet)