1
1
import xmlrpc .client
2
2
import traceback
3
- import util
3
+ from boaapi .util import parse_job
4
+ from boaapi .util import CookiesTransport
4
5
5
6
BOA_PROXY = "http://boa.cs.iastate.edu/boa/?q=boa/api"
6
7
@@ -20,7 +21,7 @@ class BoaClient(object):
20
21
21
22
def __init__ (self ):
22
23
"""Create a new Boa API client, using the standard domain/path."""
23
- self .trans = util . CookiesTransport ()
24
+ self .trans = CookiesTransport ()
24
25
self .__logged_in = False
25
26
self .server = xmlrpc .client .ServerProxy (BOA_PROXY , transport = self .trans )
26
27
@@ -171,7 +172,7 @@ def query(self, query, dataset=None):
171
172
try :
172
173
id = 0 if dataset is None else dataset .get_id ()
173
174
job = self .server .boa .submit (query , self .datasets ()[id ]['id' ])
174
- return util . parse_job (self , job )
175
+ return parse_job (self , job )
175
176
except xmlrpc .client .Fault as e :
176
177
raise BoaException (e ).with_traceback (e .__traceback__ )
177
178
@@ -189,7 +190,7 @@ def get_job(self, id):
189
190
"""
190
191
self .ensure_logged_in ()
191
192
try :
192
- return util . parse_job (self , self .server .boa .job (id ))
193
+ return parse_job (self , self .server .boa .job (id ))
193
194
except xmlrpc .client .Fault as e :
194
195
raise BoaException (e ).with_traceback (e .__traceback__ )
195
196
@@ -215,7 +216,7 @@ def job_list(self, pub_only=False, offset=0, length=1000):
215
216
newDict = []
216
217
if (len (list ) > 0 ):
217
218
for i in list :
218
- newDict .append (util . parse_job (self , i ))
219
+ newDict .append (parse_job (self , i ))
219
220
return newDict
220
221
except xmlrpc .client .Fault as e :
221
222
raise BoaException (e ).with_traceback (e .__traceback__ )
@@ -375,4 +376,4 @@ def output(self, job):
375
376
return "Job is currently running"
376
377
return self .server .job .output (job .id )
377
378
except xmlrpc .client .Fault as e :
378
- raise BoaException (e ).with_traceback (e .__traceback__ )
379
+ raise BoaException (e ).with_traceback (e .__traceback__ )
0 commit comments