diff options
author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-12-05 00:31:02 +0800 |
---|---|---|
committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-12-05 00:43:37 +0800 |
commit | 4bd7d9d4ae05319ebf6eb2aeffce7bde4fa7b6cf (patch) | |
tree | 2e1a113e863207d1773d22f6098b0ed2e47de5e7 /Makefile | |
parent | 9b5288c92ae43436a5d48775bbe1ee537588625f (diff) |
[socks] Refine exception model for better error handling
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.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions