aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-06-13 02:21:29 +0600
committerSergey M․ <dstftw@gmail.com>2015-06-13 02:21:29 +0600
commit0072afca8e02052c77dc3b7009e51114887e31b4 (patch)
treed5f048d96091354b374f5716cc260ecb41df010d /youtube_dl/YoutubeDL.py
parent61aa5ba36eea3b7cf8c3570ab33604dd2c13b855 (diff)
downloadyoutube-dl-0072afca8e02052c77dc3b7009e51114887e31b4.tar.xz
[YoutubeDL] Remove force_generic_extractor arg from process_ie_result
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-xyoutube_dl/YoutubeDL.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index dd2d8cb3c..a7d3a1c01 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -662,7 +662,7 @@ class YoutubeDL(object):
}
self.add_default_extra_info(ie_result, ie, url)
if process:
- return self.process_ie_result(ie_result, download, extra_info, force_generic_extractor=False)
+ return self.process_ie_result(ie_result, download, extra_info)
else:
return ie_result
except ExtractorError as de: # An error we somewhat expected
@@ -687,7 +687,7 @@ class YoutubeDL(object):
'extractor_key': ie.ie_key(),
})
- def process_ie_result(self, ie_result, download=True, extra_info={}, force_generic_extractor=False):
+ def process_ie_result(self, ie_result, download=True, extra_info={}):
"""
Take the result of the ie(may be modified) and resolve all unresolved
references (URLs, playlist items).
@@ -715,8 +715,7 @@ class YoutubeDL(object):
return self.extract_info(ie_result['url'],
download,
ie_key=ie_result.get('ie_key'),
- extra_info=extra_info,
- force_generic_extractor=force_generic_extractor)
+ extra_info=extra_info)
elif result_type == 'url_transparent':
# Use the information from the embedding page
info = self.extract_info(