diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 868023db9..f1931b04d 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import httplib import math import os import re @@ -460,7 +459,7 @@ class FileDownloader(object): success = self._do_download(filename, info_dict) except (OSError, IOError) as err: raise UnavailableVideoError - except (compat_urllib_error.URLError, httplib.HTTPException, socket.error) as err: + except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: self.trouble(u'ERROR: unable to download video data: %s' % str(err)) return except (ContentTooShortError, ) as err: diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 3ddaddd7f..8726e9438 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import datetime -import httplib import netrc import os import re @@ -253,7 +252,7 @@ class YoutubeIE(InfoExtractor): try: self.report_lang() compat_urllib_request.urlopen(request).read() - except (compat_urllib_error.URLError, httplib.HTTPException, socket.error) as err: + except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: self._downloader.to_stderr(u'WARNING: unable to set language: %s' % compat_str(err)) return @@ -276,7 +275,7 @@ class YoutubeIE(InfoExtractor): if re.search(r'(?i)