From 7af808a5ef4cc17ca30c8c4636660589e0e915ec Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 17 Dec 2014 00:06:41 +0100 Subject: [PATCH] Improve code style --- youtube_dl/downloader/f4m.py | 2 +- youtube_dl/downloader/rtmp.py | 2 +- youtube_dl/extractor/crunchyroll.py | 1 - youtube_dl/extractor/cspan.py | 1 - youtube_dl/extractor/tenplay.py | 1 - youtube_dl/extractor/youtube.py | 4 ++-- youtube_dl/utils.py | 2 +- 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index ef3e0d5f4..f9f6f3e73 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -203,7 +203,7 @@ def write_flv_header(stream, metadata): stream.write(b'\x00\x00\x00\x00\x00\x00\x00') stream.write(metadata) # Magic numbers extracted from the output files produced by AdobeHDS.php - #(https://github.com/K-S-V/Scripts) + # (https://github.com/K-S-V/Scripts) stream.write(b'\x00\x00\x01\x73') diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 575912675..5346cb9a0 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -185,7 +185,7 @@ class RtmpFD(FileDownloader): cursize = os.path.getsize(encodeFilename(tmpfilename)) if prevsize == cursize and retval == RD_FAILED: break - # Some rtmp streams seem abort after ~ 99.8%. Don't complain for those + # Some rtmp streams seem abort after ~ 99.8%. Don't complain for those if prevsize == cursize and retval == RD_INCOMPLETE and cursize > 1024: self.to_screen('[rtmpdump] Could not download the whole video. This can happen for some advertisements.') retval = RD_SUCCESS diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index 8f1ea02e7..2c7756eb6 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -32,7 +32,6 @@ class CrunchyrollIE(SubtitlesInfoExtractor): _VALID_URL = r'https?://(?:(?Pwww|m)\.)?(?Pcrunchyroll\.com/(?:[^/]*/[^/?&]*?|media/\?id=)(?P[0-9]+))(?:[/?&]|$)' _TEST = { 'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513', - #'md5': 'b1639fd6ddfaa43788c85f6d1dddd412', 'info_dict': { 'id': '645513', 'ext': 'flv', diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index 541106684..955119d40 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -27,7 +27,6 @@ class CSpanIE(InfoExtractor): 'url': 'http://www.c-span.org/video/?c4486943/cspan-international-health-care-models', # For whatever reason, the served video alternates between # two different ones - #'md5': 'dbb0f047376d457f2ab8b3929cbb2d0c', 'info_dict': { 'id': '340723', 'ext': 'mp4', diff --git a/youtube_dl/extractor/tenplay.py b/youtube_dl/extractor/tenplay.py index 81ba169fb..466155ef8 100644 --- a/youtube_dl/extractor/tenplay.py +++ b/youtube_dl/extractor/tenplay.py @@ -8,7 +8,6 @@ class TenPlayIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?ten(play)?\.com\.au/.+' _TEST = { 'url': 'http://tenplay.com.au/ten-insider/extra/season-2013/tenplay-tv-your-way', - #'md5': 'd68703d9f73dc8fccf3320ab34202590', 'info_dict': { 'id': '2695695426001', 'ext': 'flv', diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 100ecbc0a..550e18733 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -527,8 +527,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): return 's[%s%s%s]' % (starts, ends, steps) step = None - start = '(Never used)' # Quelch pyflakes warnings - start will be - # set as soon as step is set + # Quelch pyflakes warnings - start will be set when step is set + start = '(Never used)' for i, prev in zip(idxs[1:], idxs[:-1]): if step is not None: if i - prev == step: diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index f9938616d..43b7c94ba 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -363,7 +363,7 @@ def encodeArgument(s): if not isinstance(s, compat_str): # Legacy code that uses byte strings # Uncomment the following line after fixing all post processors - #assert False, 'Internal error: %r should be of type %r, is %r' % (s, compat_str, type(s)) + # assert False, 'Internal error: %r should be of type %r, is %r' % (s, compat_str, type(s)) s = s.decode('ascii') return encodeFilename(s, True)