From: Jaime Marquínez Ferrándiz Date: Fri, 21 Aug 2015 09:35:51 +0000 (+0200) Subject: [common] Follow convention of using 'cls' in classmethods X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8c97f81943de1c2bf8d2f524ba5ca09b29579dc8;p=youtube-dl [common] Follow convention of using 'cls' in classmethods --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index f731703fb..5d24bcb6a 100644 --- 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):