projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbbe666
)
[extractor/generic] PEP 8
author
Sergey M․
<dstftw@gmail.com>
Sat, 29 Jul 2017 08:13:12 +0000
(15:13 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 29 Jul 2017 08:13:12 +0000
(15:13 +0700)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 9678c32c44f43af88ae5249abe39c8239631b229..4b83e861bdbf7f41c4f80f87503f58fc9742f8cd 100644
(file)
--- 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():