diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-11-22 19:57:52 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-11-22 19:57:52 +0100 |
| commit | dca087205692c934163ec9aca5962056f890cd19 (patch) | |
| tree | 476c4fc3e1457d7a080e2ee253b3040ecc1bc4b7 /youtube_dl/extractor/common.py | |
| parent | 0b63aed8dfd36a5a7f5ae6518b9c385d9a43e735 (diff) | |
| download | youtube-dl-dca087205692c934163ec9aca5962056f890cd19.tar.gz youtube-dl-dca087205692c934163ec9aca5962056f890cd19.tar.xz youtube-dl-dca087205692c934163ec9aca5962056f890cd19.zip | |
Move the opener to the YoutubeDL object.
This is the first step towards being able to just import youtube_dl and start using it. Apart from removing global state, this would fix problems like #1805.
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 eb3435c77..423e54cea 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -8,7 +8,6 @@ import netrc from ..utils import ( compat_http_client, compat_urllib_error, - compat_urllib_request, compat_str, clean_html, @@ -19,6 +18,7 @@ from ..utils import ( unescapeHTML, ) + class InfoExtractor(object): """Information Extractor class. @@ -156,7 +156,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' |