Skip to content

Commit

Permalink
Merge data into params
Browse files Browse the repository at this point in the history
I don't think we're parsing GET request payloads.
This effectively restore the get behavior prior
to the previous commit.
  • Loading branch information
mvdbeek committed May 8, 2018
1 parent 276a559 commit 346d2dc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/galaxy/tools/verify/interactor.py
Expand Up @@ -553,10 +553,11 @@ def _put(self, path, data=None, key=None, admin=False, anon=False):

def _get(self, path, data={}, key=None, admin=False, anon=False):
params, data = self.__inject_api_key(data=data, key=key, admin=admin, anon=anon)
params.update(data)
if path.startswith("/api"):
path = path[len("/api"):]
url = "%s/%s" % (self.api_url, path)
return requests.get(url, params=params, data=data)
return requests.get(url, params=params)


class RunToolException(Exception):
Expand Down

0 comments on commit 346d2dc

Please sign in to comment.