X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=05486cbaea8a1ffa182870e48cdfa3dbc538eca6;hb=2a5654f70a3fdb0ca45382619098a5bea8913bf0;hp=0a2859233008f67565b485f60ce4b4dde70d6cde;hpb=df44ce2282c62534b1b243869932170349f57ba1;p=myslice.git diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py index 0a285923..05486cba 100644 --- a/manifold/manifoldproxy.py +++ b/manifold/manifoldproxy.py @@ -25,7 +25,10 @@ debug_spin=0 debug_empty=False #debug_empty=True -# turn this on if you want the fastest possible (locally cached) feedback +# Historically we had a feature for developing without an Internet connection +# However this won't work anymore as the python layer itself does manifold calls +# before javascript has a chance to do so. +# Might still come in handy if you want the fastest possible (locally cached) feedback # beware that this is very rough though... work_offline=False #work_offline=True @@ -60,7 +63,8 @@ with the query passed using POST""" # retrieve session for request # We allow some requests to use the ADMIN user account - if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'): + if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') \ + or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'): admin_user, admin_password = Config().manifold_admin_user_password() manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password} else: @@ -93,7 +97,8 @@ with the query passed using POST""" result = manifold_api.forward(manifold_query.to_dict()) # XXX TEMP HACK - if 'description' in result and result['description'] and isinstance(result['description'], (tuple, list, set, frozenset)): + if 'description' in result and result['description'] \ + and isinstance(result['description'], (tuple, list, set, frozenset)): result [ 'description' ] = [ ResultValue.to_html (x) for x in result['description'] ] json_answer=json.dumps(result)