Skip to content

handle new error behaviour in python 3.7 - fixes #40 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julie-sullivan merged 1 commit into from
Jun 28, 2019
Merged

handle new error behaviour in python 3.7 - fixes #40 #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions intermine/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ class Query(object):

>>> for row in query.result("<format name>", size = <size>)
... print(row)


Result Processing: Results
--------------------------

Expand Down Expand Up @@ -475,7 +475,10 @@ def from_xml(cls, xml, *args, **kwargs):
def group(iterator, count):
itr = iter(iterator)
while True:
yield tuple([next(itr) for i in range(count)])
try:
yield tuple([next(itr) for i in range(count)])
except StopIteration:
return

if q.getAttribute('sortOrder') is not None:
sos = Query.SO_SPLIT_PATTERN.split(q.getAttribute('sortOrder'))
Expand Down Expand Up @@ -1882,4 +1885,3 @@ class QueryParseError(QueryError):

class ResultError(ReadableException):
pass