From: Tom Clegg <tom@clinicalfuture.com>
Date: Mon, 9 Dec 2013 19:15:39 +0000 (-0800)
Subject: Use body={...} instead of object_type=json.dumps({...})
X-Git-Tag: 1.1.0~2864
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0f83b9e96a52e1ed192b97edbd1a949b2214c147

Use body={...} instead of object_type=json.dumps({...})
---

diff --git a/crunch_scripts/pgp-survey-import b/crunch_scripts/pgp-survey-import
index 8d9b3d5855..811dd11872 100755
--- a/crunch_scripts/pgp-survey-import
+++ b/crunch_scripts/pgp-survey-import
@@ -57,15 +57,15 @@ for input_file in arvados.CollectionReader(this_job_input).all_files():
                 human_uuid = huID_links_match[0]['head_uuid']
             else:
                 human = arvados.service.humans().create(
-                    human=json.dumps({})
+                    body={}
                     ).execute()
                 huID_link = arvados.service.links().create(
-                    link=json.dumps({
-                            'link_class':'identifier',
-                            'name':words[0],
-                            'head_kind':'arvados#human',
-                            'head_uuid':human['uuid']
-                            })
+                    body={
+                        'link_class':'identifier',
+                        'name':words[0],
+                        'head_kind':'arvados#human',
+                        'head_uuid':human['uuid']
+                        }
                     ).execute()
                 human_uuid = human['uuid']
             human_trait = {}
@@ -89,7 +89,7 @@ for input_file in arvados.CollectionReader(this_job_input).all_files():
                         trait_link['properties']['value'] = trait_value
                         arvados.service.links().update(
                             uuid=trait_link['uuid'],
-                            link=json.dumps({'properties':trait_link['properties']})
+                            body={'properties':trait_link['properties']}
                             ).execute()
                     out.write(",\n")
                     out.write(json.dumps(trait_link))
@@ -107,7 +107,7 @@ for input_file in arvados.CollectionReader(this_job_input).all_files():
                         'properties': { 'value': trait_value }
                         }
                     arvados.service.links().create(
-                        link=json.dumps(trait_link)
+                        body=trait_link
                         ).execute()
                     out.write(",\n")
                     out.write(json.dumps(trait_link))
diff --git a/doc/user/tutorial-trait-search.textile b/doc/user/tutorial-trait-search.textile
index 92646a7364..0c93ef6143 100644
--- a/doc/user/tutorial-trait-search.textile
+++ b/doc/user/tutorial-trait-search.textile
@@ -190,11 +190,11 @@ Look for variant rs1126809 in each of the "var" files (these contain variant cal
 job = {}
 for c in collections:
   if [] != filter(lambda f: re.search('^var-.*\.tsv\.bz2', f[1]), c['files']):
-    job[c['uuid']] = arvados.service.jobs().create(job=json.dumps({
+    job[c['uuid']] = arvados.service.jobs().create(body={
       'script': 'grep',
       'script_parameters': {'input': c['uuid'], 'pattern': "rs1126809\\b"},
       'script_version': 'e7aeb42'
-    })).execute()
+    }).execute()
     print "%s %s" % (pgpid[c['uuid']], job[c['uuid']]['uuid'])
 
 </pre>
diff --git a/sdk/python/arvados.py b/sdk/python/arvados.py
index f4fe070786..7af0609670 100644
--- a/sdk/python/arvados.py
+++ b/sdk/python/arvados.py
@@ -64,11 +64,11 @@ service = build("arvados", "v1", http=http, discoveryServiceUrl=url)
 
 def task_set_output(self,s):
     service.job_tasks().update(uuid=self['uuid'],
-                               job_task=json.dumps({
-                'output':s,
-                'success':True,
-                'progress':1.0
-                })).execute()
+                               body={
+            'output':s,
+            'success':True,
+            'progress':1.0
+            }).execute()
 
 _current_task = None
 def current_task():
@@ -121,10 +121,10 @@ class job_setup:
                         'input':task_input
                         }
                     }
-                service.job_tasks().create(job_task=json.dumps(new_task_attrs)).execute()
+                service.job_tasks().create(body=new_task_attrs).execute()
         if and_end_task:
             service.job_tasks().update(uuid=current_task()['uuid'],
-                                       job_task=json.dumps({'success':True})
+                                       body={'success':True}
                                        ).execute()
             exit(0)
 
@@ -144,10 +144,10 @@ class job_setup:
                     'input':task_input
                     }
                 }
-            service.job_tasks().create(job_task=json.dumps(new_task_attrs)).execute()
+            service.job_tasks().create(body=new_task_attrs).execute()
         if and_end_task:
             service.job_tasks().update(uuid=current_task()['uuid'],
-                                       job_task=json.dumps({'success':True})
+                                       body={'success':True}
                                        ).execute()
             exit(0)