desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Jaime Marquínez Ferrándiz 2015-08-21 11:35:51 +02:00
parent d7c1630570
commit 8c97f81943
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/common.py
View File

@ -1289,11 +1289,11 @@ class InfoExtractor(object):
return ret return ret
@classmethod @classmethod
def _merge_subtitles(kls, subtitle_dict1, subtitle_dict2): def _merge_subtitles(cls, subtitle_dict1, subtitle_dict2):
""" Merge two subtitle dictionaries, language by language. """ """ Merge two subtitle dictionaries, language by language. """
ret = dict(subtitle_dict1) ret = dict(subtitle_dict1)
for lang in subtitle_dict2: 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 return ret
def extract_automatic_captions(self, *args, **kwargs): def extract_automatic_captions(self, *args, **kwargs):