Move globbing to util.

Author: DailyDreaming

wes_client/util.py

@@ -157,6 +157,7 @@ def run(self, wf, jsonyaml, attachments):
 
         :return: The body of the post result as a dictionary.
         """
+        attachments = list(expand_globs(attachments))
         parts = build_wes_request(wf, jsonyaml, attachments)
         postresult = requests.post("%s://%s/ga4gh/wes/v1/runs" % (self.proto, self.host),
                                    files=parts,

wes_client/wes_client_main.py

@@ -8,7 +8,7 @@
 import logging
 import requests
 from requests.exceptions import InvalidSchema, MissingSchema
-from wes_client.util import modify_jsonyaml_paths, expand_globs, WESClient
+from wes_client.util import modify_jsonyaml_paths, WESClient
 
 
 def main(argv=sys.argv[1:]):
@@ -87,7 +87,6 @@ def main(argv=sys.argv[1:]):
         logging.basicConfig(level=logging.INFO)
 
     args.attachments = args.attachments if not args.attachments else args.attachments.split(',')
-    args.attachments = list(expand_globs(args.attachments))
     r = client.run(args.workflow_url, args.job_order, args.attachments)
 
     if args.wait: