mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-23 07:40:57 +02:00
Clean up unused imports and other minor mistakes
This commit is contained in:
parent
cc13cc0251
commit
f3682997d7
@ -71,10 +71,8 @@ def _real_extract(self, url):
|
||||
|
||||
adoc = xml.etree.ElementTree.fromstring(manifestXml)
|
||||
try:
|
||||
media_node = adoc.findall('./{http://ns.adobe.com/f4m/1.0}media')[0]
|
||||
node_id = media_node.attrib['url']
|
||||
video_id = adoc.findall('./{http://ns.adobe.com/f4m/1.0}id')[0].text
|
||||
except IndexError as err:
|
||||
except IndexError:
|
||||
raise ExtractorError(u'Invalid manifest file')
|
||||
url_pr = compat_urllib_parse_urlparse(info['thumbnail'])
|
||||
info['url'] = url_pr.scheme + '://' + url_pr.netloc + video_id[:-2].replace('.csmil','').replace(',','')
|
||||
|
@ -1,4 +1,3 @@
|
||||
import itertools
|
||||
import json
|
||||
import random
|
||||
import re
|
||||
|
@ -1,5 +1,4 @@
|
||||
import json
|
||||
import netrc
|
||||
import re
|
||||
import socket
|
||||
|
||||
|
@ -39,7 +39,6 @@ def _real_extract(self, url):
|
||||
for i, _ in enumerate(files, 1):
|
||||
video_id = '%04d%d' % (episode, i)
|
||||
video_url = 'http://dl%d.fernsehkritik.tv/fernsehkritik%d%s.flv' % (server, episode, '' if i == 1 else '-%d' % i)
|
||||
video_title = 'Fernsehkritik %d.%d' % (episode, i)
|
||||
videos.append({
|
||||
'id': video_id,
|
||||
'url': video_url,
|
||||
|
@ -24,7 +24,7 @@ class GameSpotIE(InfoExtractor):
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
page_id = video_id = mobj.group('page_id')
|
||||
page_id = mobj.group('page_id')
|
||||
webpage = self._download_webpage(url, page_id)
|
||||
data_video_json = self._search_regex(r'data-video=\'(.*?)\'', webpage, u'data video')
|
||||
data_video = json.loads(unescapeHTML(data_video_json))
|
||||
|
@ -22,7 +22,7 @@ class JeuxVideoIE(InfoExtractor):
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
title = re.match(self._VALID_URL, url).group(1)
|
||||
title = mobj.group(1)
|
||||
webpage = self._download_webpage(url, title)
|
||||
xml_link = self._html_search_regex(
|
||||
r'<param name="flashvars" value="config=(.*?)" />',
|
||||
|
@ -6,9 +6,7 @@
|
||||
from ..utils import (
|
||||
compat_urllib_parse_urlparse,
|
||||
compat_urlparse,
|
||||
get_meta_content,
|
||||
xpath_with_ns,
|
||||
ExtractorError,
|
||||
)
|
||||
|
||||
|
||||
|
@ -59,7 +59,6 @@ def _extract_video_formats(self, metadataXml):
|
||||
if '/error_country_block.swf' in metadataXml:
|
||||
raise ExtractorError(u'This video is not available from your country.', expected=True)
|
||||
mdoc = xml.etree.ElementTree.fromstring(metadataXml.encode('utf-8'))
|
||||
renditions = mdoc.findall('.//rendition')
|
||||
|
||||
formats = []
|
||||
for rendition in mdoc.findall('.//rendition'):
|
||||
|
@ -6,7 +6,6 @@
|
||||
compat_urllib_parse_urlparse,
|
||||
compat_urllib_request,
|
||||
compat_urllib_parse,
|
||||
unescapeHTML,
|
||||
)
|
||||
from ..aes import (
|
||||
aes_decrypt_text
|
||||
|
@ -158,7 +158,6 @@ def _real_extract(self, url):
|
||||
resolv_url = self._resolv_url(url)
|
||||
info_json = self._download_webpage(resolv_url, full_title)
|
||||
|
||||
videos = []
|
||||
info = json.loads(info_json)
|
||||
if 'errors' in info:
|
||||
for err in info['errors']:
|
||||
|
@ -6,7 +6,6 @@
|
||||
compat_urllib_parse_urlparse,
|
||||
compat_urllib_request,
|
||||
compat_urllib_parse,
|
||||
unescapeHTML,
|
||||
)
|
||||
from ..aes import (
|
||||
aes_decrypt_text
|
||||
|
@ -2,7 +2,6 @@
|
||||
import xml.etree.ElementTree
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import determine_ext
|
||||
|
||||
|
||||
class SpiegelIE(InfoExtractor):
|
||||
|
@ -4,7 +4,6 @@
|
||||
from .subtitles import SubtitlesInfoExtractor
|
||||
|
||||
from ..utils import (
|
||||
compat_str,
|
||||
RegexNotFoundError,
|
||||
)
|
||||
|
||||
@ -113,6 +112,6 @@ def _get_available_subtitles(self, video_id, webpage):
|
||||
url = 'http://www.ted.com/talks/subtitles/id/%s/lang/%s/format/srt' % (video_id, l)
|
||||
sub_lang_list[l] = url
|
||||
return sub_lang_list
|
||||
except RegexNotFoundError as err:
|
||||
except RegexNotFoundError:
|
||||
self._downloader.report_warning(u'video doesn\'t have subtitles')
|
||||
return {}
|
||||
|
@ -5,8 +5,6 @@
|
||||
from ..utils import (
|
||||
compat_urllib_parse_urlparse,
|
||||
compat_urllib_request,
|
||||
compat_urllib_parse,
|
||||
unescapeHTML,
|
||||
)
|
||||
from ..aes import (
|
||||
aes_decrypt_text
|
||||
|
@ -5,7 +5,6 @@
|
||||
from ..utils import (
|
||||
compat_urllib_parse_urlparse,
|
||||
compat_urllib_request,
|
||||
compat_urllib_parse,
|
||||
)
|
||||
|
||||
class XTubeIE(InfoExtractor):
|
||||
|
@ -53,7 +53,7 @@ def stream_pref(s):
|
||||
video_id,
|
||||
u'Get stream URL')
|
||||
|
||||
MMS_STREAM = r'href="(?P<video_url>mms://[^"]*)"'
|
||||
#MMS_STREAM = r'href="(?P<video_url>mms://[^"]*)"'
|
||||
RTSP_STREAM = r'(?P<video_url>rtsp://[^"]*.mp4)'
|
||||
|
||||
mobj = re.search(self._MEDIA_STREAM, media_link)
|
||||
|
Loading…
Reference in New Issue
Block a user