projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'David-Development/rtl2.py'
[youtube-dl]
/
youtube_dl
/
compat.py
diff --git
a/youtube_dl/compat.py
b/youtube_dl/compat.py
index 44a902573e56e2df184ff6d677d49dc265f7973e..4453b34fceea50861ccedec0ec177a12f424274d 100644
(file)
--- a/
youtube_dl/compat.py
+++ b/
youtube_dl/compat.py
@@
-329,7
+329,7
@@
if sys.version_info < (2, 7):
if err is not None:
raise err
else:
if err is not None:
raise err
else:
- raise error("getaddrinfo returns an empty list")
+ raise
socket.
error("getaddrinfo returns an empty list")
else:
compat_socket_create_connection = socket.create_connection
else:
compat_socket_create_connection = socket.create_connection
@@
-369,8
+369,8
@@
__all__ = [
'compat_ord',
'compat_parse_qs',
'compat_print',
'compat_ord',
'compat_parse_qs',
'compat_print',
- 'compat_str',
'compat_socket_create_connection',
'compat_socket_create_connection',
+ 'compat_str',
'compat_subprocess_get_DEVNULL',
'compat_urllib_error',
'compat_urllib_parse',
'compat_subprocess_get_DEVNULL',
'compat_urllib_error',
'compat_urllib_parse',