Browse Source

Clean up unused imports and other minor mistakes

rtmp_test
Philipp Hagemeister 11 years ago
parent
commit
f3682997d7
16 changed files with 5 additions and 21 deletions
  1. +1
    -3
      youtube_dl/extractor/collegehumor.py
  2. +0
    -1
      youtube_dl/extractor/eighttracks.py
  3. +0
    -1
      youtube_dl/extractor/facebook.py
  4. +0
    -1
      youtube_dl/extractor/fktv.py
  5. +1
    -1
      youtube_dl/extractor/gamespot.py
  6. +1
    -1
      youtube_dl/extractor/jeuxvideo.py
  7. +0
    -2
      youtube_dl/extractor/livestream.py
  8. +0
    -1
      youtube_dl/extractor/mtv.py
  9. +0
    -1
      youtube_dl/extractor/pornhub.py
  10. +0
    -1
      youtube_dl/extractor/soundcloud.py
  11. +0
    -1
      youtube_dl/extractor/spankwire.py
  12. +0
    -1
      youtube_dl/extractor/spiegel.py
  13. +1
    -2
      youtube_dl/extractor/ted.py
  14. +0
    -2
      youtube_dl/extractor/tube8.py
  15. +0
    -1
      youtube_dl/extractor/xtube.py
  16. +1
    -1
      youtube_dl/extractor/zdf.py

+ 1
- 3
youtube_dl/extractor/collegehumor.py View File

@ -71,10 +71,8 @@ class CollegeHumorIE(InfoExtractor):
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(',','')


+ 0
- 1
youtube_dl/extractor/eighttracks.py View File

@ -1,4 +1,3 @@
import itertools
import json
import random
import re


+ 0
- 1
youtube_dl/extractor/facebook.py View File

@ -1,5 +1,4 @@
import json
import netrc
import re
import socket


+ 0
- 1
youtube_dl/extractor/fktv.py View File

@ -39,7 +39,6 @@ class FKTVIE(InfoExtractor):
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,


+ 1
- 1
youtube_dl/extractor/gamespot.py View File

@ -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))


+ 1
- 1
youtube_dl/extractor/jeuxvideo.py View File

@ -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=(.*?)" />',


+ 0
- 2
youtube_dl/extractor/livestream.py View File

@ -6,9 +6,7 @@ from .common import InfoExtractor
from ..utils import (
compat_urllib_parse_urlparse,
compat_urlparse,
get_meta_content,
xpath_with_ns,
ExtractorError,
)


+ 0
- 1
youtube_dl/extractor/mtv.py View File

@ -59,7 +59,6 @@ class MTVIE(InfoExtractor):
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'):


+ 0
- 1
youtube_dl/extractor/pornhub.py View File

@ -6,7 +6,6 @@ from ..utils import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
unescapeHTML,
)
from ..aes import (
aes_decrypt_text


+ 0
- 1
youtube_dl/extractor/soundcloud.py View File

@ -158,7 +158,6 @@ class SoundcloudSetIE(SoundcloudIE):
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']:


+ 0
- 1
youtube_dl/extractor/spankwire.py View File

@ -6,7 +6,6 @@ from ..utils import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
unescapeHTML,
)
from ..aes import (
aes_decrypt_text


+ 0
- 1
youtube_dl/extractor/spiegel.py View File

@ -2,7 +2,6 @@ import re
import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import determine_ext
class SpiegelIE(InfoExtractor):


+ 1
- 2
youtube_dl/extractor/ted.py View File

@ -4,7 +4,6 @@ import re
from .subtitles import SubtitlesInfoExtractor
from ..utils import (
compat_str,
RegexNotFoundError,
)
@ -113,6 +112,6 @@ class TEDIE(SubtitlesInfoExtractor):
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 {}

+ 0
- 2
youtube_dl/extractor/tube8.py View File

@ -5,8 +5,6 @@ from .common import InfoExtractor
from ..utils import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
unescapeHTML,
)
from ..aes import (
aes_decrypt_text


+ 0
- 1
youtube_dl/extractor/xtube.py View File

@ -5,7 +5,6 @@ from .common import InfoExtractor
from ..utils import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
)
class XTubeIE(InfoExtractor):


+ 1
- 1
youtube_dl/extractor/zdf.py View File

@ -53,7 +53,7 @@ class ZDFIE(InfoExtractor):
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…
Cancel
Save