aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-07-29 15:13:12 +0700
committerSergey M․ <dstftw@gmail.com>2017-07-29 15:13:12 +0700
commit95908ce45382a72be26e918f8db1809b0ce81190 (patch)
tree3d37a7013042fb43f6e7fdcc6dbdb5093715a074 /youtube_dl/extractor
parentcbbe66635f3c23316f04a6f56ad57e025bc47263 (diff)
[extractor/generic] PEP 8
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/generic.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 9678c32c4..4b83e861b 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -2797,7 +2797,6 @@ class GenericIE(InfoExtractor):
return self.playlist_from_matches(
mpfn_urls, video_id, video_title, ie=MegaphoneIE.ie_key())
-
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():