Add output stream to astakos print methods

kamaki/cli/commands/astakos.py

@@ -34,7 +34,7 @@
 from kamaki.cli import command
 from kamaki.clients.astakos import AstakosClient
 from kamaki.cli.commands import (
-    _command_init, errors, _optional_json, addLogSettings)
+    _command_init, errors, _optional_json, addLogSettings, stdout)
 from kamaki.cli.command_tree import CommandTree
 from kamaki.cli.errors import CLIBaseUrlError, CLIError
 from kamaki.cli.utils import print_dict, ask_user
@@ -88,8 +88,8 @@ class user_authenticate(_user_init, _optional_json):
     """
 
     @staticmethod
-    def _print_access(r):
-        print_dict(r['access'])
+    def _print_access(r, out=stdout):
+        print_dict(r['access'], out=out)
 
     @errors.generic.all
     @errors.user.authenticate

kamaki/clients/__init__.py

@@ -149,9 +149,10 @@ class RequestManager(Logged):
         sendlog.info('%s %s://%s%s%s' % (
             self.method, self.scheme, self.netloc, self.path, plog))
         for key, val in self.headers.items():
-            if (not self.LOG_TOKEN) and key.lower() == 'x-auth-token':
-                continue
-            sendlog.info('  %s: %s%s' % (key, val, plog))
+            #if (not self.LOG_TOKEN) and key.lower() == 'x-auth-token':
+            #    continue
+            show = (key.lower() != 'x-auth-token') or self.LOG_TOKEN
+            sendlog.info('  %s: %s%s' % (key, val if show else '', plog))
         if self.data:
             sendlog.info('data size:%s%s' % (len(self.data), plog))
             if self.LOG_DATA: