youtube-dl

Another place where youtube-dl lives on
git clone git://git.oshgnacknak.de/youtube-dl.git
Log | Files | Refs | README | LICENSE

commit 8c97f81943de1c2bf8d2f524ba5ca09b29579dc8
parent d7c16305707f2af5c47d91b67cf0850b4dcada3a
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Fri, 21 Aug 2015 11:35:51 +0200

[common] Follow convention of using 'cls' in classmethods

Diffstat:
Myoutube_dl/extractor/common.py | 4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py @@ -1289,11 +1289,11 @@ class InfoExtractor(object): return ret @classmethod - def _merge_subtitles(kls, subtitle_dict1, subtitle_dict2): + def _merge_subtitles(cls, subtitle_dict1, subtitle_dict2): """ Merge two subtitle dictionaries, language by language. """ ret = dict(subtitle_dict1) for lang in subtitle_dict2: - ret[lang] = kls._merge_subtitle_items(subtitle_dict1.get(lang, []), subtitle_dict2[lang]) + ret[lang] = cls._merge_subtitle_items(subtitle_dict1.get(lang, []), subtitle_dict2[lang]) return ret def extract_automatic_captions(self, *args, **kwargs):