Merge remote-tracking branch 'origin/master' into config_stop

Author: dheiman

changelog.txt

@@ -3,6 +3,11 @@ Change Log for FISSFC: the (Fi)recloud (S)ervice (S)elector
 =======================================================================
 Terms used below:  HL = high level interface, LL = low level interface
 
+v0.16.4 -  Correctly escape characters in JSON/CLI interaction; Allow Service 
+           Account FireCloud users to run FISS; Consolidated into a global fcconfig 
+           and cache credentials; Fixed status to health change; Enable the updating 
+           of entities by allowing the 'update:' header; Enable access token caching;
+           Fix for API breaking changes in create workspace/clone_workspace.
 v0.16.3 -  HL flow_start() renamed to config_start, because only configs can
            actually be submitted for execution (i.e. 'started'), and only
            when residing in a workspace; other HL flow_* commands renamed to

firecloud/fiss.py

@@ -11,7 +11,7 @@
 import os
 import time
 from inspect import getsourcelines
-from traceback import print_exc, print_tb as print_traceback
+from traceback import print_tb as print_traceback
 import argparse
 import subprocess
 import re
@@ -1602,7 +1602,6 @@ def __pretty_print_fc_exception(e):
         if isinstance(code, str):
             preface = ''
         source  = ''
-        print_exc(2)
         msg = "{0}".format(e)
 
     print("{0}{1}{2}: {3}".format(preface, code, source, msg))
@@ -1616,7 +1615,7 @@ def printToCLI(value):
         if header:
             print('\t'.join(header))
         for k, v in sorted(value.items()):
-            print(u("{0}\t{1}".format(k,v)))
+            print(u'{0}\t{1}'.format(k, v))
     elif isinstance(value, (list, tuple)):
         list(map(lambda v: print(v), value))
     elif not isinstance(value, int):
@@ -2007,12 +2006,13 @@ def main(argv=None):
     subp.set_defaults(func=health)
 
     subp = subparsers.add_parser('attr_get',
-        description='Retrieve values of attribute(s) from given entity',
+        description='Retrieve attribute values from an entity identified by '\
+        'name and type.  If either name or type are omitted then workspace '\
+        'attributes will be returned.',
         parents=[workspace_parent, attr_parent])
 
     # etype_parent not used for attr_get, because entity type is optional
     etype_help =  'Entity type to retrieve annotations from. '
-    etype_help += 'If omitted, workspace attributes will be retrieved'
     etype_choices=['participant', 'participant_set', 'sample', 'sample_set',
         'pair', 'pair_set' ]
     subp.add_argument('-t', '--entity-type', choices=etype_choices,