R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed styling issues that flake8 didn't like

Browse Source
This commit is contained in:
Philip Ardery 2015-03-14 21:26:11 -04:00
parent 0ede245462
commit 9fcc22c0f2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -638,7 +638,7 @@ class YoutubeDL(object):
# ignore non-familiar links # ignore non-familiar links
if c != 'GenericIE' and c != 'MovieStormIE' and ie.suitable(farmed_url): if c != 'GenericIE' and c != 'MovieStormIE' and ie.suitable(farmed_url):
familiar_farmed_urls.append( [ie, farmed_url] ) familiar_farmed_urls.append([ie, farmed_url])
for tuple in familiar_farmed_urls: for tuple in familiar_farmed_urls:
ie = tuple[0] ie = tuple[0]

11
youtube_dl/extractor/moviestorm.py
View File

@ -2,7 +2,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import os.path import os.path
import re
from time import sleep from time import sleep
from .common import InfoExtractor from .common import InfoExtractor
@ -12,6 +11,7 @@ from ..compat import (
compat_urlparse compat_urlparse
) )
class MovieStormHTMLParser(compat_html_parser.HTMLParser): class MovieStormHTMLParser(compat_html_parser.HTMLParser):
def __init__(self): def __init__(self):
self.found_button = False self.found_button = False
@ -46,6 +46,7 @@ class MovieStormHTMLParser(compat_html_parser.HTMLParser):
p.close() p.close()
return getattr(p, return_variable) return getattr(p, return_variable)
class MovieStormIE(InfoExtractor): class MovieStormIE(InfoExtractor):
"""EXTRACTOR INFO: """EXTRACTOR INFO:
There are no tests for this IE because the links on any given moviestorm There are no tests for this IE because the links on any given moviestorm
@ -92,7 +93,7 @@ class MovieStormIE(InfoExtractor):
# Inform user to provide proper moviestorm link # Inform user to provide proper moviestorm link
if 'watch' not in url: if 'watch' not in url:
msg = ('The moviestorm handler requires either a movie page link or ' msg = ('The moviestorm handler requires either a movie page link or '
'a series episode page link. Please try again with one of those.') 'a series episode page link. Please try again with one of those.')
raise ExtractorError(msg, expected=True) raise ExtractorError(msg, expected=True)
while True: while True:
@ -100,8 +101,8 @@ class MovieStormIE(InfoExtractor):
note = 'Downloading link farm page' note = 'Downloading link farm page'
else: else:
note = ('Unstable db connection, retying again in %s seconds ' note = ('Unstable db connection, retying again in %s seconds '
'[%s/%s]' % (self.retry_wait, self.retry_count, '[%s/%s]' % (self.retry_wait, self.retry_count,
self.max_retries)) self.max_retries))
(_, _, token) = self._parse_target(url) (_, _, token) = self._parse_target(url)
farmpage = self._download_webpage( farmpage = self._download_webpage(
@ -120,7 +121,7 @@ class MovieStormIE(InfoExtractor):
# Fail if provided series home page # Fail if provided series home page
if series_home_page: if series_home_page:
msg = ('It looks like you provided an show page url. You must provide ' msg = ('It looks like you provided an show page url. You must provide '
'an episode page url or movie page url') 'an episode page url or movie page url')
raise ExtractorError(msg, expected=True) raise ExtractorError(msg, expected=True)
# Success # Success