git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
manifold
/
manifoldapi.py
diff --git
a/manifold/manifoldapi.py
b/manifold/manifoldapi.py
index
8d4d1ac
..
3f4bd10
100644
(file)
--- a/
manifold/manifoldapi.py
+++ b/
manifold/manifoldapi.py
@@
-65,8
+65,11
@@
class ManifoldAPI:
return ResultValue(**result)
except Exception,error:
return ResultValue(**result)
except Exception,error:
- # XXX Connection refused for example
- print "** API ERROR **"
+ if "Connection refused" in error:
+ raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE,
+ output="%s answered %s"%(self.url,error)))
+ # otherwise
+ print "** MANIFOLD API ERROR **"
import traceback
traceback.print_exc()
if debug: print "KO (unexpected exception)",error
import traceback
traceback.print_exc()
if debug: print "KO (unexpected exception)",error
@@
-76,7
+79,7
@@
class ManifoldAPI:
def execute_query(request, query):
if not 'manifold' in request.session or not 'auth' in request.session['manifold']:
def execute_query(request, query):
if not 'manifold' in request.session or not 'auth' in request.session['manifold']:
- print "W: Us
ed
hardcoded demo account for execute_query"
+ print "W: Us
ing
hardcoded demo account for execute_query"
manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
else:
manifold_api_session_auth = request.session['manifold']['auth']
manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
else:
manifold_api_session_auth = request.session['manifold']['auth']