aboutsummaryrefslogtreecommitdiffstats
path: root/yt_dlp/extractor
diff options
context:
space:
mode:
authorpukkandan <pukkandan.ytdlp@gmail.com>2021-05-04 22:36:18 +0530
committerpukkandan <pukkandan.ytdlp@gmail.com>2021-05-04 22:36:18 +0530
commit3158150cb758f4b0a582a2bccf2bc88385e27a27 (patch)
tree2eccfc9b5ac0ad9a83cc52ddbd582e0122c8cefc /yt_dlp/extractor
parent6ef6bcbd6bf413340f4ea232780e504f6598b7e9 (diff)
downloadhypervideo-pre-3158150cb758f4b0a582a2bccf2bc88385e27a27.tar.lz
hypervideo-pre-3158150cb758f4b0a582a2bccf2bc88385e27a27.tar.xz
hypervideo-pre-3158150cb758f4b0a582a2bccf2bc88385e27a27.zip
[utils] Add `network_exceptions`
Diffstat (limited to 'yt_dlp/extractor')
-rw-r--r--yt_dlp/extractor/common.py8
-rw-r--r--yt_dlp/extractor/facebook.py6
2 files changed, 4 insertions, 10 deletions
diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py
index 642c94930..e2a9a3801 100644
--- a/yt_dlp/extractor/common.py
+++ b/yt_dlp/extractor/common.py
@@ -9,8 +9,6 @@ import netrc
import os
import random
import re
-import socket
-import ssl
import sys
import time
import math
@@ -58,6 +56,7 @@ from ..utils import (
js_to_json,
JSON_LD_RE,
mimetype2ext,
+ network_exceptions,
orderedSet,
parse_bitrate,
parse_codecs,
@@ -659,12 +658,9 @@ class InfoExtractor(object):
url_or_request = update_url_query(url_or_request, query)
if data is not None or headers:
url_or_request = sanitized_Request(url_or_request, data, headers)
- exceptions = [compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error]
- if hasattr(ssl, 'CertificateError'):
- exceptions.append(ssl.CertificateError)
try:
return self._downloader.urlopen(url_or_request)
- except tuple(exceptions) as err:
+ except network_exceptions as err:
if isinstance(err, compat_urllib_error.HTTPError):
if self.__can_accept_status_code(err, expected_status):
# Retain reference to error to prevent file object from
diff --git a/yt_dlp/extractor/facebook.py b/yt_dlp/extractor/facebook.py
index b68b90bd3..d29b9aab9 100644
--- a/yt_dlp/extractor/facebook.py
+++ b/yt_dlp/extractor/facebook.py
@@ -3,14 +3,11 @@ from __future__ import unicode_literals
import json
import re
-import socket
from .common import InfoExtractor
from ..compat import (
compat_etree_fromstring,
- compat_http_client,
compat_str,
- compat_urllib_error,
compat_urllib_parse_unquote,
compat_urllib_parse_unquote_plus,
)
@@ -23,6 +20,7 @@ from ..utils import (
int_or_none,
js_to_json,
limit_length,
+ network_exceptions,
parse_count,
qualities,
sanitized_Request,
@@ -370,7 +368,7 @@ class FacebookIE(InfoExtractor):
note='Confirming login')
if re.search(r'id="checkpointSubmitButton"', check_response) is not None:
self.report_warning('Unable to confirm login, you have to login in your browser and authorize the login.')
- except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
+ except network_exceptions as err:
self.report_warning('unable to log in: %s' % error_to_compat_str(err))
return