Skip to content

Commit 45f9bf9

Browse files
committed
fix more long lines
1 parent 62e57f1 commit 45f9bf9

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

intermine/webservice.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,13 @@ def __init__(self, root,
297297
self.version
298298
except WebserviceError as e:
299299
raise ServiceError(
300-
"Could not validate service - is the root url (%s) correct? %s" % (root, e))
300+
"Could not validate service - is the root url (%s) correct? %s"
301+
% (root, e))
301302

302303
if token and self.version < 6:
303304
raise ServiceError(
304-
"This service does not support API access token authentication")
305+
"This service does not support API access token authentication"
306+
)
305307

306308
# Set up sugary aliases
307309
self.query = self.new_query
@@ -310,7 +312,8 @@ def __init__(self, root,
310312

311313
LIST_MANAGER_METHODS = frozenset(["get_list", "get_all_lists",
312314
"get_all_list_names",
313-
"create_list", "get_list_count", "delete_lists", "l"])
315+
"create_list", "get_list_count",
316+
"delete_lists", "l"])
314317

315318
def get_anonymous_token(self, url):
316319
"""
@@ -377,7 +380,8 @@ def version(self):
377380
self._version = int(self.opener.open(url).read())
378381
except ValueError as e:
379382
raise ServiceError(
380-
"Could not parse a valid webservice version: " + str(e))
383+
"Could not parse a valid webservice version: "
384+
+ str(e))
381385
except AttributeError as e:
382386
raise Exception(e)
383387
return self._version
@@ -437,11 +441,13 @@ def select(self, *columns, **kwargs):
437441
view = columns[0]
438442
if isinstance(view, Attribute):
439443
return Query(self.model, self).select("%s.%s" %
440-
(view.declared_in.name, view))
444+
(view.declared_in.name,
445+
view))
441446

442447
if isinstance(view, Reference):
443448
return Query(self.model, self).select("%s.%s.*" %
444-
(view.declared_in.name, view))
449+
(view.declared_in.name,
450+
view))
445451
elif not isinstance(view, Column) and not str(view).endswith("*"):
446452
path = self.model.make_path(view)
447453
if not path.is_attribute():
@@ -484,15 +490,17 @@ def get_template(self, name):
484490

485491
def _get_json(self, path, payload=None):
486492
headers = {'Accept': 'application/json'}
487-
with closing(self.opener.open(self.root + path, payload, headers=headers)) as resp:
493+
with closing(self.opener.open(self.root + path, payload,
494+
headers=headers)) as resp:
488495
data = json.loads(ensure_str(resp.read()))
489496
if data['error'] is not None:
490497
raise ServiceError(data['error'])
491498
return data
492499

493500
def _get_xml(self, path):
494501
headers = {'Accept': 'application/xml'}
495-
with closing(self.opener.open(self.root + path, headers=headers)) as sock:
502+
with closing(self.opener.open(self.root + path,
503+
headers=headers)) as sock:
496504
return minidom.parse(sock)
497505

498506
def search(self, term, **facets):

0 commit comments

Comments
 (0)