rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove exception handling code for qutescheme.

Browse Source 
The exceptions now get handled by @prevent_exceptions on the createRequest
method of the NetworkManager, causing the exception handler to pop up properly.
This commit is contained in:
Florian Bruhin 2014-09-16 22:08:10 +02:00
parent 3bded60ba6
commit cef1dfe368
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/network/qutescheme.py
View File

@ -55,7 +55,6 @@ class QuteSchemeHandler(schemehandler.SchemeHandler):
Return: Return:
A QNetworkReply. A QNetworkReply.
""" """
try:
path = request.url().path() path = request.url().path()
# An url like "qute:foo" is split as "scheme:path", not # An url like "qute:foo" is split as "scheme:path", not
# "scheme:host". # "scheme:host".
@ -73,18 +72,6 @@ class QuteSchemeHandler(schemehandler.SchemeHandler):
data = handler() data = handler()
return schemehandler.SpecialNetworkReply( return schemehandler.SpecialNetworkReply(
request, data, 'text/html', self.parent()) request, data, 'text/html', self.parent())
except: # pylint: disable=bare-except
# WORKAROUND
# Any exception raised in here will trigger a segfault.
# To prevent this, we return a page with the exception info.
# FIXME: We should report this to PyQt upstream.
text = "Exception in QuteSchemeHandler.createRequest:\n\n"
text += traceback.format_exc()
text += ("\nPlease use :report to report a bug and add the "
"information printed here by hand.")
data = text.encode('utf-8')
return schemehandler.SpecialNetworkReply(
request, data, 'text/plain', self.parent())
class QuteHandlers: class QuteHandlers: