Philipp Hagemeister 10 ani în urmă
părinte
comite
fa15607773

+ 1 - 2
youtube_dl/extractor/common.py

@@ -27,7 +27,6 @@ from ..utils import (
     compiled_regex_type,
     compiled_regex_type,
     ExtractorError,
     ExtractorError,
     float_or_none,
     float_or_none,
-    HEADRequest,
     int_or_none,
     int_or_none,
     RegexNotFoundError,
     RegexNotFoundError,
     sanitize_filename,
     sanitize_filename,
@@ -839,7 +838,7 @@ class InfoExtractor(object):
             note='Downloading m3u8 information',
             note='Downloading m3u8 information',
             errnote='Failed to download m3u8 information')
             errnote='Failed to download m3u8 information')
         last_info = None
         last_info = None
-        last_media= None
+        last_media = None
         kv_rex = re.compile(
         kv_rex = re.compile(
             r'(?P<key>[a-zA-Z_-]+)=(?P<val>"[^"]+"|[^",]+)(?:,|$)')
             r'(?P<key>[a-zA-Z_-]+)=(?P<val>"[^"]+"|[^",]+)(?:,|$)')
         for line in m3u8_doc.splitlines():
         for line in m3u8_doc.splitlines():

+ 1 - 0
youtube_dl/extractor/twitch.py

@@ -348,6 +348,7 @@ class TwitchStreamIE(TwitchBaseIE):
             '%s/api/channel/hls/%s.m3u8?%s'
             '%s/api/channel/hls/%s.m3u8?%s'
             % (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query).encode('utf-8')),
             % (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query).encode('utf-8')),
             channel_id, 'mp4')
             channel_id, 'mp4')
+
         # prefer the 'source' stream, the others are limited to 30 fps
         # prefer the 'source' stream, the others are limited to 30 fps
         def _sort_source(f):
         def _sort_source(f):
             if f.get('m3u8_media') is not None and f['m3u8_media'].get('NAME') == 'Source':
             if f.get('m3u8_media') is not None and f['m3u8_media'].get('NAME') == 'Source':

+ 1 - 1
youtube_dl/extractor/videolecturesnet.py

@@ -52,7 +52,7 @@ class VideoLecturesNetIE(InfoExtractor):
         formats = []
         formats = []
         for v in switch.findall('./video'):
         for v in switch.findall('./video'):
             proto = v.attrib.get('proto')
             proto = v.attrib.get('proto')
-            if not proto in ['http', 'rtmp']:
+            if proto not in ['http', 'rtmp']:
                 continue
                 continue
             f = {
             f = {
                 'width': int_or_none(v.attrib.get('width')),
                 'width': int_or_none(v.attrib.get('width')),