From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 9 Feb 2016 17:42:42 +0000 (+0100)
Subject: import error config and manifoldapi.manifoldresult
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=89af8babd28a7da90ffe59be3ce7b7e812734cd0

import error config and manifoldapi.manifoldresult
---

diff --git a/manifoldapi/manifoldapi.py b/manifoldapi/manifoldapi.py
index d9f4b8f8..de258b79 100644
--- a/manifoldapi/manifoldapi.py
+++ b/manifoldapi/manifoldapi.py
@@ -10,7 +10,7 @@ from django.contrib import messages
 from django.shortcuts import redirect
 
 from manifold.core.result_value import ResultValue
-from manifoldapi.manifoldresult import ManifoldResult, ManifoldCode, ManifoldException, truncate_result
+from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException, truncate_result
 
 # being available from the outside (r2lab django web site)
 try:
@@ -133,12 +133,13 @@ def execute_query(request, query):
 
 def execute_admin_query(request, query):
     # xxx config
+    from myslice.settings import config
+    url = config.manifold_url()
+
     admin_user, admin_password = config.manifold_admin_user_password()
     if not admin_user or not admin_password:
         logger.error("""CONFIG: you need to setup admin_user and admin_password in myslice.ini
 Some functions won't work properly until you do so""")
     admin_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
 
-    from myslice.settings import config
-    url = config.manifold_url()
     return _execute_query(url, request, query, admin_auth)
diff --git a/manifoldapi/metadata.py b/manifoldapi/metadata.py
index 7e61d704..9513929a 100644
--- a/manifoldapi/metadata.py
+++ b/manifoldapi/metadata.py
@@ -1,8 +1,8 @@
 import json 
 import os.path
 
-from manifoldapi.manifoldresult  import ManifoldResult
-from manifoldapi.manifoldapi     import ManifoldAPI
+from manifoldresult  import ManifoldResult
+from manifoldapi     import ManifoldAPI
 
 from django.contrib     import messages