X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fcommon.py;h=16a069403c4049c037b0385bae5bd11165550521;hb=24e34365889f45eda036c974816ec6e9f5ebab09;hp=43a5b054d2c37c5de92c5e2de92307433c7812f3;hpb=866350aac4c72675b8dd6c0b8b5b0673470d1dea;p=sfa.git

diff --git a/sfa/client/common.py b/sfa/client/common.py
index 43a5b054..16a06940 100644
--- a/sfa/client/common.py
+++ b/sfa/client/common.py
@@ -1,5 +1,7 @@
 # a few utilities common to sfi and sfaadmin
 
+from __future__ import print_function
+
 def optparse_listvalue_callback(option, opt, value, parser):
     former=getattr(parser.values,option.dest)
     if not former: former=[]
@@ -41,29 +43,37 @@ def terminal_render_plural (how_many, name,names=None):
     else: return "%d %s"%(how_many,names)
 
 def terminal_render_default (record,options):
-    print "%s (%s)" % (record['hrn'], record['type'])
+    print("%s (%s)" % (record['hrn'], record['type']))
 def terminal_render_user (record, options):
-    print "%s (User)"%record['hrn'],
-    if record.get('reg-pi-authorities',None): print " [PI at %s]"%(" and ".join(record['reg-pi-authorities'])),
-    if record.get('reg-slices',None): print " [IN slices %s]"%(" and ".join(record['reg-slices'])),
+    print("%s (User)"%record['hrn'], end=' ')
+    if options.verbose and record.get('email', None):
+        print("email='{}'".format(record['email']), end=' ')
+    if record.get('reg-pi-authorities', None):
+        print(" [PI at %s]"%(" and ".join(record['reg-pi-authorities'])), end=' ')
+    if record.get('reg-slices', None):
+        print(" [IN slices %s]"%(" and ".join(record['reg-slices'])), end=' ')
     user_keys=record.get('reg-keys',[])
     if not options.verbose:
-        print " [has %s]"%(terminal_render_plural(len(user_keys),"key"))
+        print(" [has %s]"%(terminal_render_plural(len(user_keys),"key")))
     else:
-        print ""
-        for key in user_keys: print 8*' ',key.strip("\n")
+        print("")
+        for key in user_keys: print(8*' ',key.strip("\n"))
         
 def terminal_render_slice (record, options):
-    print "%s (Slice)"%record['hrn'],
-    if record.get('reg-researchers',None): print " [USERS %s]"%(" and ".join(record['reg-researchers'])),
+    print("%s (Slice)"%record['hrn'], end=' ')
+    if record.get('reg-researchers', None):
+        print(" [USERS %s]"%(" and ".join(record['reg-researchers'])), end=' ')
 #    print record.keys()
-    print ""
+    print("")
 def terminal_render_authority (record, options):
-    print "%s (Authority)"%record['hrn'],
-    if record.get('reg-pis',None): print " [PIS %s]"%(" and ".join(record['reg-pis'])),
-    print ""
+    print("%s (Authority)"%record['hrn'], end=' ')
+    if options.verbose and record.get('name'):
+        print("name='{}'".format(record['name']))
+    if record.get('reg-pis', None):
+        print(" [PIS %s]"%(" and ".join(record['reg-pis'])), end=' ')
+    print("")
 def terminal_render_node (record, options):
-    print "%s (Node)"%record['hrn']
+    print("%s (Node)"%record['hrn'])
 
 
 ### used in sfi list