1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/eb89d0a2fe44/ Changeset: eb89d0a2fe44 User: carlfeberhard Date: 2013-06-12 16:35:11 Summary: scripts/api: Fixes to upload_to_history.py Affected #: 1 file diff -r 253c49c5b4977a49d2f87ff7729a2fe575c0c355 -r eb89d0a2fe4426888a7589b8a4e9906269bd4fbc scripts/api/upload_to_history.py --- a/scripts/api/upload_to_history.py +++ b/scripts/api/upload_to_history.py @@ -17,7 +17,7 @@ # ----------------------------------------------------------------------------- -def upload_file( full_url, api_key, history_id, filepath, **kwargs ): +def upload_file( base_url, api_key, history_id, filepath, **kwargs ): full_url = base_url + '/api/tools' payload = { @@ -33,7 +33,7 @@ 'dbkey' : '?', 'file_type' : kwargs.get( 'file_type', 'auto' ), 'ajax_upload' : u'true', - 'async_datasets': '1', + #'async_datasets': '1', } payload[ 'inputs' ] = json.dumps( inputs ) @@ -41,7 +41,7 @@ with open( filepath, 'rb' ) as file_to_upload: files = { 'files_0|file_data' : file_to_upload } response = requests.post( full_url, data=payload, files=files ) - return response + return response.json() # ----------------------------------------------------------------------------- Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.