# HG changeset patch # User Catherine Wise # Date 1431478788 -36000 # Node ID 7b3039ccf50fea5b9f2c7916ac68b802ca97e197 # Parent 589f9250e30f1752a0b11d0ce24e5970fde64b33 Un-quote url. diff -r 589f9250e30f -r 7b3039ccf50f TrustStoreGalaxyBrowse.py --- a/TrustStoreGalaxyBrowse.py Wed May 13 10:54:07 2015 +1000 +++ b/TrustStoreGalaxyBrowse.py Wed May 13 10:59:48 2015 +1000 @@ -7,6 +7,7 @@ import os import json import operator +import urlparse from py_ts import TrustStoreClient, utils from galaxy.datatypes.checkers import util @@ -112,15 +113,15 @@ extra_files_path, file_name, ext, out_data_name, hda_id, dataset_id = \ operator.itemgetter('extra_files_path', 'file_name', 'ext', 'out_data_name', 'hda_id', 'dataset_id')(output_data[0]) - url_params = json_params['URL'].split(";") + url_params = urlparse.unquote(json_params['URL']).split(";") if len(url_params) < 3: - print("The url we got back is malformed: "+ url_params) + print("The url we got back is malformed: "+ json_params['URL']) sys.exit(5) short_url = url_params[0] username = url_params[1] password = url_params[2] if "/short" not in short_url: - print("The url we got back is malformed: " + url_params) + print("The url we got back is malformed: " + json_params['URL']) sys.exit(5) kms_url = short_url.split("/short")[0]