mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-20 12:24:57 +00:00
Code Issues Projects Releases Wiki Activity

[socks] Refine exception model for better error handling

Browse Source 
1. ProxyError now inherits from socket.error instead of IOError

The only functions socks.py overrides are connect and connect_ex. In
Python 2.x and Python <= 3.2, socket functions raises socket.error. In
newer Python versions, those functions raises OSError instead. The name
socket.error is preserved as an alias of OSError for backward
compability. To keep socks.py compatible with Python's standard library,
it should raise the same exception as raw sockets.

See PEP 3151 (https://www.python.org/dev/peps/pep-3151/) for more
information about the change in Python 3.3.

2. Raise EOFError instead of IOError when the socket receives less data
than it expects

There's no common convention, but both ftplib and telnetlib raises
EOFError for similar situations. socks.py follows them.

Closes #11355

In #11355, only Python 2 is affected. In Python 3, both socket.error and
IOError are alias of OSError, so AbstractHTTPHandler.do_open correctly
catches the error and thus InfoExtractor._is_valid_url works fine.
This commit is contained in:
Yen Chi Hsuan 2016-12-05 00:31:02 +08:00
parent 9b5288c92a
commit 4bd7d9d4ae
No known key found for this signature in database
GPG Key ID: 7F902A182457CA23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/socks.py
View File

@ -55,7 +55,7 @@ class Socks5AddressType(object):
ATYP_IPV6 = 0x04 ATYP_IPV6 = 0x04
class ProxyError(IOError): class ProxyError(socket.error):
ERR_SUCCESS = 0x00 ERR_SUCCESS = 0x00
def __init__(self, code=None, msg=None): def __init__(self, code=None, msg=None):
@ -123,7 +123,7 @@ class sockssocket(socket.socket):
while len(data) < cnt: while len(data) < cnt:
cur = self.recv(cnt - len(data)) cur = self.recv(cnt - len(data))
if not cur: if not cur:
raise IOError('{0} bytes missing'.format(cnt - len(data))) raise EOFError('{0} bytes missing'.format(cnt - len(data)))
data += cur data += cur
return data return data