From 66361e1e9399b34df78c98daa519eaf4658789b5 Mon Sep 17 00:00:00 2001 From: John Hawkinson Date: Tue, 21 Mar 2017 14:21:28 -0400 Subject: [PATCH] [external] Make get_execname() a classmethod per @dstftw --- youtube_dl/downloader/external.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index 8b1a0fff3..e49629100 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -51,8 +51,9 @@ class ExternalFD(FileDownloader): def get_basename(cls): return cls.__name__[:-2].lower() - def get_execname(self): - return self.__class__.get_basename() + @classmethod + def get_execname(cls): + return cls.get_basename() @property def exe(self): @@ -195,19 +196,19 @@ class FFmpegFD(ExternalFD): def available(cls): return FFmpegPostProcessor().available + @classmethod def get_execname(self): - return self.execname + return FFmpegPostProcessor().executable def _call_downloader(self, tmpfilename, info_dict): url = info_dict['url'] ffpp = FFmpegPostProcessor(downloader=self) - self.execname = ffpp.executable if not ffpp.available: self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.') return False ffpp.check_version() - args = [self.execname, '-y'] + args = [ffpp.executable, '-y'] seekable = info_dict.get('_seekable') if seekable is not None: