Merge 8c8a1c0956
into d65d89183f
This commit is contained in:
commit
a6cdb6bfda
|
@ -806,7 +806,8 @@ class InfoExtractor(object):
|
|||
if res is False:
|
||||
return res
|
||||
else:
|
||||
content, _ = res
|
||||
content, urlh = res
|
||||
urlh.close()
|
||||
return content
|
||||
|
||||
def _download_xml_handle(
|
||||
|
@ -845,7 +846,12 @@ class InfoExtractor(object):
|
|||
transform_source=transform_source, fatal=fatal, encoding=encoding,
|
||||
data=data, headers=headers, query=query,
|
||||
expected_status=expected_status)
|
||||
return res if res is False else res[0]
|
||||
if res is False:
|
||||
return res
|
||||
else:
|
||||
content, urlh = res
|
||||
urlh.close()
|
||||
return content
|
||||
|
||||
def _parse_xml(self, xml_string, video_id, transform_source=None, fatal=True):
|
||||
if transform_source:
|
||||
|
@ -895,7 +901,12 @@ class InfoExtractor(object):
|
|||
transform_source=transform_source, fatal=fatal, encoding=encoding,
|
||||
data=data, headers=headers, query=query,
|
||||
expected_status=expected_status)
|
||||
return res if res is False else res[0]
|
||||
if res is False:
|
||||
return res
|
||||
else:
|
||||
content, urlh = res
|
||||
urlh.close()
|
||||
return content
|
||||
|
||||
def _parse_json(self, json_string, video_id, transform_source=None, fatal=True):
|
||||
if transform_source:
|
||||
|
|
Loading…
Reference in New Issue