projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[funnyordie] Improve extraction
[youtube-dl]
/
youtube_dl
/
socks.py
diff --git
a/youtube_dl/socks.py
b/youtube_dl/socks.py
index fd49d74352c7d50e15956169f686c3ffbb107b5c..63d19b3a5214221afa71a6d43bde36a39c13cd4b 100644
(file)
--- a/
youtube_dl/socks.py
+++ b/
youtube_dl/socks.py
@@
-76,7
+76,7
@@
class Socks4Error(ProxyError):
CODES = {
91: 'request rejected or failed',
CODES = {
91: 'request rejected or failed',
- 92: 'request rejected beca
su
e SOCKS server cannot connect to identd on the client',
+ 92: 'request rejected beca
us
e SOCKS server cannot connect to identd on the client',
93: 'request rejected because the client program and identd report different user-ids'
}
93: 'request rejected because the client program and identd report different user-ids'
}
@@
-103,6
+103,7
@@
class ProxyType(object):
SOCKS4A = 1
SOCKS5 = 2
SOCKS4A = 1
SOCKS5 = 2
+
Proxy = collections.namedtuple('Proxy', (
'type', 'host', 'port', 'username', 'password', 'remote_dns'))
Proxy = collections.namedtuple('Proxy', (
'type', 'host', 'port', 'username', 'password', 'remote_dns'))