Mercurial > repos > cathywise > truststore_browse_testing

changeset 15:7b3039ccf50f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Un-quote url.
author Catherine Wise <catherine.wise@csiro.au>
date Wed, 13 May 2015 10:59:48 +1000
parents 589f9250e30f
children 10ce45af14dd
files TrustStoreGalaxyBrowse.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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]