diff options
| author | Philipp Hagemeister <[email protected]> | 2013-11-25 03:30:37 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <[email protected]> | 2013-11-25 03:30:37 +0100 |
| commit | 79d09f47c2abafe94c36d5c6718038c854748360 (patch) | |
| tree | abe26f1cd8c2eb60e03e260433bf670e8d12323a /youtube_dl/extractor/common.py | |
| parent | c059bdd432911cff8c7426380a876c9679855ab5 (diff) | |
| parent | e03db0a0773e078d9b677d396ad78362654956af (diff) | |
| download | youtube-dl-79d09f47c2abafe94c36d5c6718038c854748360.tar.gz youtube-dl-79d09f47c2abafe94c36d5c6718038c854748360.zip | |
Merge branch 'opener-to-ydl'
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 3d8ac8ba2..5656445a3 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -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' |