From 09392478e62e4ff2e4f6849cb82567554c1fbe55 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 1 Aug 2021 13:35:45 -0700 Subject: [PATCH] getUrlFd: chain the original exception so that plugins can handle them further (#1487) --- src/utils/web.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utils/web.py b/src/utils/web.py index 7cf231604..3a1a666a5 100644 --- a/src/utils/web.py +++ b/src/utils/web.py @@ -153,18 +153,18 @@ def getUrlFd(url, headers=None, data=None, timeout=None): fd = urlopen(request, timeout=timeout) return fd except socket.timeout as e: - raise Error(TIMED_OUT) + raise Error(TIMED_OUT) from e except sockerrors as e: - raise Error(strError(e)) + raise Error(strError(e)) from e except InvalidURL as e: - raise Error('Invalid URL: %s' % e) + raise Error('Invalid URL: %s' % e) from e except HTTPError as e: - raise Error(strError(e)) + raise Error(strError(e)) from e except URLError as e: - raise Error(strError(e.reason)) + raise Error(strError(e.reason)) from e # Raised when urllib doesn't recognize the url type except ValueError as e: - raise Error(strError(e)) + raise Error(strError(e)) from e def getUrlTargetAndContent(url, size=None, headers=None, data=None, timeout=None): """getUrlTargetAndContent(url, size=None, headers=None, data=None, timeout=None)