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

Fix running qute:log and qute:plainlog

Browse Source 
This failed because dict.get('level') returned None with no level
parameter, and the subsequent [0] raised:

    Traceback (most recent call last):
      File ".../qutebrowser/utils/utils.py", line 624, in wrapper
        return func(*args, **kwargs)
      File ".../qutebrowser/browser/network/networkmanager.py", line 445, in createRequest
        op, req, outgoing_data)
      File ".../qutebrowser/browser/network/qutescheme.py", line 107, in createRequest
        data = handler(self._win_id, request)
      File ".../qutebrowser/browser/network/qutescheme.py", line 189, in qute_log
        level = urllib.parse.parse_qs(request.url().query()).get('level')[0]
    TypeError: 'NoneType' object is not subscriptable
This commit is contained in:
Florian Bruhin 2016-05-15 11:33:30 +02:00
parent bb31787931
commit b704c911ae
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/browser/network/qutescheme.py
View File

@ -169,7 +169,10 @@ def qute_plainlog(_win_id, request):
if log.ram_handler is None: if log.ram_handler is None:
text = "Log output was disabled." text = "Log output was disabled."
else: else:
level = urllib.parse.parse_qs(request.url().query()).get('level')[0] try:
level = urllib.parse.parse_qs(request.url().query())['level'][0]
except KeyError:
level = 'vdebug'
text = log.ram_handler.dump_log(html=False, level=level) text = log.ram_handler.dump_log(html=False, level=level)
html = jinja.render('pre.html', title='log', content=text) html = jinja.render('pre.html', title='log', content=text)
return html.encode('UTF-8', errors='xmlcharrefreplace') return html.encode('UTF-8', errors='xmlcharrefreplace')
@ -186,7 +189,10 @@ def qute_log(_win_id, request):
if log.ram_handler is None: if log.ram_handler is None:
html_log = None html_log = None
else: else:
level = urllib.parse.parse_qs(request.url().query()).get('level')[0] try:
level = urllib.parse.parse_qs(request.url().query())['level'][0]
except KeyError:
level = 'vdebug'
html_log = log.ram_handler.dump_log(html=True, level=level) html_log = log.ram_handler.dump_log(html=True, level=level)
html = jinja.render('log.html', title='log', content=html_log) html = jinja.render('log.html', title='log', content=html_log)

8
tests/integration/features/misc.feature
View File

@ -418,3 +418,11 @@ Feature: Various utility commands.
Scenario: Showing messages of an invalid level Scenario: Showing messages of an invalid level
When I run :messages cataclysmic When I run :messages cataclysmic
Then the error "Invalid log level cataclysmic!" should be shown Then the error "Invalid log level cataclysmic!" should be shown
Scenario: Using qute:log directly
When I open qute:log
Then no crash should happen
Scenario: Using qute:plainlog directly
When I open qute:plainlog
Then no crash should happen