projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'progress-as-hook2'
[youtube-dl]
/
youtube_dl
/
downloader
/
http.py
diff --git
a/youtube_dl/downloader/http.py
b/youtube_dl/downloader/http.py
index 6dec528f268c9da4eb8ac534b2da8f247ec7cf4b..2e3dac8251dbaf5d8b3e1a90bc459f362d14f72e 100644
(file)
--- a/
youtube_dl/downloader/http.py
+++ b/
youtube_dl/downloader/http.py
@@
-1,11
+1,10
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+import errno
import os
import os
+import socket
import time
import time
-from socket import error as SocketError
-import errno
-
from .common import FileDownloader
from ..compat import (
compat_urllib_request,
from .common import FileDownloader
from ..compat import (
compat_urllib_request,
@@
-101,7
+100,7
@@
class HttpFD(FileDownloader):
resume_len = 0
open_mode = 'wb'
break
resume_len = 0
open_mode = 'wb'
break
- except
SocketE
rror as e:
+ except
socket.e
rror as e:
if e.errno != errno.ECONNRESET:
# Connection reset is no problem, just retry
raise
if e.errno != errno.ECONNRESET:
# Connection reset is no problem, just retry
raise