Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'Tithen-Firion/hsw-update'

Browse source
This commit is contained in:
Philipp Hagemeister 2014-12-12 04:10:55 +01:00
commit bf94e38d3d
2 changed files with 49 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/common.py
View file

@ -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: