From 13332cd2cf1c0d23461ae4772086757ce62c0545 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 21 Jun 2018 22:28:27 +0200 Subject: Fix shadowing of 'html' name (cherry picked from commit 0864ad406927a0810aaca307909f8665778e4713) --- qutebrowser/browser/qutescheme.py | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 9bcd2e363..e3777c389 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -124,12 +124,12 @@ class add_handler: # noqa: N801,N806 pylint: disable=invalid-name def wrong_backend_handler(self, url): """Show an error page about using the invalid backend.""" - html = jinja.render('error.html', - title="Error while opening qute://url", - url=url.toDisplayString(), - error='{} is not available with this ' - 'backend'.format(url.toDisplayString())) - return 'text/html', html + src = jinja.render('error.html', + title="Error while opening qute://url", + url=url.toDisplayString(), + error='{} is not available with this ' + 'backend'.format(url.toDisplayString())) + return 'text/html', src def data_for_url(url): @@ -197,11 +197,11 @@ def qute_bookmarks(_url): quickmarks = sorted(objreg.get('quickmark-manager').marks.items(), key=lambda x: x[0]) # Sort by name - html = jinja.render('bookmarks.html', - title='Bookmarks', - bookmarks=bookmarks, - quickmarks=quickmarks) - return 'text/html', html + src = jinja.render('bookmarks.html', + title='Bookmarks', + bookmarks=bookmarks, + quickmarks=quickmarks) + return 'text/html', src @add_handler('tabs') @@ -219,10 +219,10 @@ def qute_tabs(_url): urlstr = tab.url().toDisplayString() tabs[str(win_id)].append((tab.title(), urlstr)) - html = jinja.render('tabs.html', - title='Tabs', - tab_list_by_window=tabs) - return 'text/html', html + src = jinja.render('tabs.html', + title='Tabs', + tab_list_by_window=tabs) + return 'text/html', src def history_data(start_time, offset=None): @@ -289,25 +289,25 @@ def qute_javascript(url): @add_handler('pyeval') def qute_pyeval(_url): """Handler for qute://pyeval.""" - html = jinja.render('pre.html', title='pyeval', content=pyeval_output) - return 'text/html', html + src = jinja.render('pre.html', title='pyeval', content=pyeval_output) + return 'text/html', src @add_handler('spawn-output') def qute_spawn_output(_url): """Handler for qute://spawn-output.""" - html = jinja.render('pre.html', title='spawn output', content=spawn_output) - return 'text/html', html + src = jinja.render('pre.html', title='spawn output', content=spawn_output) + return 'text/html', src @add_handler('version') @add_handler('verizon') def qute_version(_url): """Handler for qute://version.""" - html = jinja.render('version.html', title='Version info', - version=version.version(), - copyright=qutebrowser.__copyright__) - return 'text/html', html + src = jinja.render('version.html', title='Version info', + version=version.version(), + copyright=qutebrowser.__copyright__) + return 'text/html', src @add_handler('plainlog') @@ -325,8 +325,8 @@ def qute_plainlog(url): if not level: level = 'vdebug' text = log.ram_handler.dump_log(html=False, level=level) - html = jinja.render('pre.html', title='log', content=text) - return 'text/html', html + src = jinja.render('pre.html', title='log', content=text) + return 'text/html', src @add_handler('log') @@ -345,8 +345,8 @@ def qute_log(url): level = 'vdebug' html_log = log.ram_handler.dump_log(html=True, level=level) - html = jinja.render('log.html', title='log', content=html_log) - return 'text/html', html + src = jinja.render('log.html', title='log', content=html_log) + return 'text/html', src @add_handler('gpl') @@ -417,12 +417,12 @@ def qute_help(url): @add_handler('backend-warning') def qute_backend_warning(_url): """Handler for qute://backend-warning.""" - html = jinja.render('backend-warning.html', - distribution=version.distribution(), - Distribution=version.Distribution, - version=pkg_resources.parse_version, - title="Legacy backend warning") - return 'text/html', html + src = jinja.render('backend-warning.html', + distribution=version.distribution(), + Distribution=version.Distribution, + version=pkg_resources.parse_version, + title="Legacy backend warning") + return 'text/html', src def _qute_settings_set(url): @@ -452,10 +452,10 @@ def qute_settings(url): if url.path() == '/set': return _qute_settings_set(url) - html = jinja.render('settings.html', title='settings', - configdata=configdata, - confget=config.instance.get_str) - return 'text/html', html + src = jinja.render('settings.html', title='settings', + configdata=configdata, + confget=config.instance.get_str) + return 'text/html', src @add_handler('bindings') @@ -469,9 +469,9 @@ def qute_bindings(_url): for mode in modes: bindings[mode] = config.key_instance.get_bindings_for(mode) - html = jinja.render('bindings.html', title='Bindings', - bindings=bindings) - return 'text/html', html + src = jinja.render('bindings.html', title='Bindings', + bindings=bindings) + return 'text/html', src @add_handler('back') @@ -480,10 +480,10 @@ def qute_back(url): Simple page to free ram / lazy load a site, goes back on focusing the tab. """ - html = jinja.render( + src = jinja.render( 'back.html', title='Suspended: ' + urllib.parse.unquote(url.fragment())) - return 'text/html', html + return 'text/html', src @add_handler('configdiff') -- cgit v1.2.3-54-g00ecf