archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fixed unit test by doing late import

Browse Source 
For some reason the old pillar.auth stuck around, failing the
`isinstance(some_object, auth.UserClass)` check because it compared to the
old class and not the reloaded one.
This commit is contained in:
Sybren A. Stüvel
2019-05-31 10:22:46 +02:00
parent 0f0a4be412
commit 3705b60f25
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pillar/web/jinja.py
View File

@@ -16,7 +16,6 @@ from werkzeug.local import LocalProxy
import pillarsdk import pillarsdk
import pillar.api.utils import pillar.api.utils
from pillar import auth
from pillar.api.utils import pretty_duration from pillar.api.utils import pretty_duration
from pillar.web.utils import pretty_date from pillar.web.utils import pretty_date
from pillar.web.nodes.routes import url_for_node from pillar.web.nodes.routes import url_for_node
@@ -227,6 +226,8 @@ def user_to_dict(user: auth.UserClass) -> dict:
def do_json(some_object) -> str: def do_json(some_object) -> str:
import pillar.auth
if isinstance(some_object, LocalProxy): if isinstance(some_object, LocalProxy):
return do_json(some_object._get_current_object()) return do_json(some_object._get_current_object())
if isinstance(some_object, pillarsdk.Resource): if isinstance(some_object, pillarsdk.Resource):