Fix HTTP error handling
This commit is contained in:
parent
8790f85835
commit
c0e330d50d
@ -25,7 +25,6 @@ def downloadPage(window,downloadId,url,headers = False):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
requestHandler = opener.open(url)
|
requestHandler = opener.open(url)
|
||||||
|
|
||||||
# Check whether to transfer the page to the viewer, or if to open downloader
|
# Check whether to transfer the page to the viewer, or if to open downloader
|
||||||
response["headers"] = requestHandler.getheaders()
|
response["headers"] = requestHandler.getheaders()
|
||||||
contentType, contentTypeArguments = getContentType(response["headers"],"application/octet-stream")
|
contentType, contentTypeArguments = getContentType(response["headers"],"application/octet-stream")
|
||||||
@ -35,8 +34,9 @@ def downloadPage(window,downloadId,url,headers = False):
|
|||||||
response["body"] = requestHandler.read()
|
response["body"] = requestHandler.read()
|
||||||
requestHandler.close()
|
requestHandler.close()
|
||||||
except urllib.error.HTTPError as e:
|
except urllib.error.HTTPError as e:
|
||||||
|
response["headers"] = e.getheaders()
|
||||||
response["body"] = e.read()
|
response["body"] = e.read()
|
||||||
requestHandler.close()
|
e.close()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
response["body"] = str(e).encode("utf-8")
|
response["body"] = str(e).encode("utf-8")
|
||||||
response["headers"] = [["content-type","text; charset=utf-8"]]
|
response["headers"] = [["content-type","text; charset=utf-8"]]
|
||||||
|
Loading…
Reference in New Issue
Block a user