Merge branch 'opener-to-ydl'
This commit is contained in:
commit
79d09f47c2
4 changed files with 97 additions and 97 deletions
|
@ -9,7 +9,6 @@ import xml.etree.ElementTree
|
|||
from ..utils import (
|
||||
compat_http_client,
|
||||
compat_urllib_error,
|
||||
compat_urllib_request,
|
||||
compat_str,
|
||||
|
||||
clean_html,
|
||||
|
@ -20,6 +19,7 @@ from ..utils import (
|
|||
unescapeHTML,
|
||||
)
|
||||
|
||||
|
||||
class InfoExtractor(object):
|
||||
"""Information Extractor class.
|
||||
|
||||
|
@ -158,7 +158,7 @@ class InfoExtractor(object):
|
|||
elif note is not False:
|
||||
self.to_screen(u'%s: %s' % (video_id, note))
|
||||
try:
|
||||
return compat_urllib_request.urlopen(url_or_request)
|
||||
return self._downloader.urlopen(url_or_request)
|
||||
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
|
||||
if errnote is None:
|
||||
errnote = u'Unable to download webpage'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue