diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/downloader/http.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/common.py | 3 | ||||
| -rw-r--r-- | youtube_dl/extractor/twitch.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/videolecturesnet.py | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index 6dec528f2..2e3dac825 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals +import errno import os +import socket import time -from socket import error as SocketError -import errno - from .common import FileDownloader from ..compat import ( compat_urllib_request, @@ -101,7 +100,7 @@ class HttpFD(FileDownloader): resume_len = 0 open_mode = 'wb' break - except SocketError as e: + except socket.error as e: if e.errno != errno.ECONNRESET: # Connection reset is no problem, just retry raise diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 31599bf52..08b8ad37c 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -27,7 +27,6 @@ from ..utils import ( compiled_regex_type, ExtractorError, float_or_none, - HEADRequest, int_or_none, RegexNotFoundError, sanitize_filename, @@ -839,7 +838,7 @@ class InfoExtractor(object): note='Downloading m3u8 information', errnote='Failed to download m3u8 information') last_info = None - last_media= None + last_media = None kv_rex = re.compile( r'(?P<key>[a-zA-Z_-]+)=(?P<val>"[^"]+"|[^",]+)(?:,|$)') for line in m3u8_doc.splitlines(): diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py index 8e296698e..4b0d8988d 100644 --- a/youtube_dl/extractor/twitch.py +++ b/youtube_dl/extractor/twitch.py @@ -348,6 +348,7 @@ class TwitchStreamIE(TwitchBaseIE): '%s/api/channel/hls/%s.m3u8?%s' % (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query).encode('utf-8')), channel_id, 'mp4') + # prefer the 'source' stream, the others are limited to 30 fps def _sort_source(f): if f.get('m3u8_media') is not None and f['m3u8_media'].get('NAME') == 'Source': diff --git a/youtube_dl/extractor/videolecturesnet.py b/youtube_dl/extractor/videolecturesnet.py index d46234856..d6a7eb203 100644 --- a/youtube_dl/extractor/videolecturesnet.py +++ b/youtube_dl/extractor/videolecturesnet.py @@ -52,7 +52,7 @@ class VideoLecturesNetIE(InfoExtractor): formats = [] for v in switch.findall('./video'): proto = v.attrib.get('proto') - if not proto in ['http', 'rtmp']: + if proto not in ['http', 'rtmp']: continue f = { 'width': int_or_none(v.attrib.get('width')), |