aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-12-12 04:10:55 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-12-12 04:10:55 +0100
commitbf94e38d3d4aeb4edd5fc10ed9f4e905ee179913 (patch)
tree2735d0b340c7bdd4185462c236346d6b3a4f8bb9 /youtube_dl/extractor/common.py
parent4f978523161abb0af241a91da13158d6d91ff442 (diff)
parente638e83662e5baa414b8d80145e46c1912f7998d (diff)
downloadyoutube-dl-bf94e38d3d4aeb4edd5fc10ed9f4e905ee179913.tar.xz
Merge remote-tracking branch 'Tithen-Firion/hsw-update'
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index c2e24def1..d302fe45f 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -392,6 +392,10 @@ class InfoExtractor(object):
url_or_request, video_id, note, errnote, fatal=fatal)
if (not fatal) and json_string is False:
return None
+ return self._parse_json(
+ json_string, video_id, transform_source=transform_source, fatal=fatal)
+
+ def _parse_json(self, json_string, video_id, transform_source=None, fatal=True):
if transform_source:
json_string = transform_source(json_string)
try: