diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-12-20 14:17:30 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-12-20 16:54:08 +0100 |
| commit | 9479b1a108e51f5d644d9943f797e09dd87dc609 (patch) | |
| tree | 34adede9c0ee9cf7a2db096b6ca2fb970734fdc2 | |
| parent | 608a1ead410607c6fd7394dcf75d55495448b4ea (diff) | |
| download | qutebrowser-9479b1a108e51f5d644d9943f797e09dd87dc609.tar.gz qutebrowser-9479b1a108e51f5d644d9943f797e09dd87dc609.zip | |
Avoid circular jinja imports
configutils -> configexc -> jinja -> urlutils -> config -> configutils
javascript -> jinja -> javascript
| -rw-r--r-- | qutebrowser/config/configexc.py | 3 | ||||
| -rw-r--r-- | qutebrowser/utils/javascript.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py index d83ca403b..53b6689f8 100644 --- a/qutebrowser/config/configexc.py +++ b/qutebrowser/config/configexc.py @@ -22,7 +22,7 @@ import typing import attr -from qutebrowser.utils import jinja, usertypes, log +from qutebrowser.utils import usertypes, log class Error(Exception): @@ -155,6 +155,7 @@ class ConfigFileErrors(Error): def to_html(self) -> str: """Get the error texts as a HTML snippet.""" + from qutebrowser.utils import jinja # circular import template = jinja.environment.from_string(""" Errors occurred while reading {{ basename }}: diff --git a/qutebrowser/utils/javascript.py b/qutebrowser/utils/javascript.py index f456d93c9..2c02975db 100644 --- a/qutebrowser/utils/javascript.py +++ b/qutebrowser/utils/javascript.py @@ -21,8 +21,6 @@ import typing -from qutebrowser.utils import jinja - _InnerJsArgType = typing.Union[None, str, bool, int, float] _JsArgType = typing.Union[_InnerJsArgType, typing.Sequence[_InnerJsArgType]] @@ -83,5 +81,6 @@ def assemble(module: str, function: str, *args: _JsArgType) -> str: def wrap_global(name: str, *sources: str) -> str: """Wrap a script using window._qutebrowser.""" + from qutebrowser.utils import jinja # circular import template = jinja.js_environment.get_template('global_wrapper.js') return template.render(code='\n'.join(sources), name=name) |