aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-08-21 11:35:51 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-08-21 11:35:51 +0200
commit8c97f81943de1c2bf8d2f524ba5ca09b29579dc8 (patch)
tree68fc06c38c6a0342cfeecde511302c98bb794c5d /youtube_dl
parentd7c16305707f2af5c47d91b67cf0850b4dcada3a (diff)
downloadyoutube-dl-8c97f81943de1c2bf8d2f524ba5ca09b29579dc8.tar.xz
[common] Follow convention of using 'cls' in classmethods
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/common.py4
1 files changed, 2 insertions, 2 deletions
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):