From acb21cb926d77482b8ef73045e30f453cad23787 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Fri, 1 Jan 2016 14:39:10 -0800
Subject: [PATCH] Clean signature printing

---
 src/gam.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gam.py b/src/gam.py
index 9d386584..424588ec 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -4812,12 +4812,12 @@ def getSignature(users):
       user = user[:user.find(u'@')]
     else:
       emailsettings.domain = GC_Values[GC_DOMAIN]
-    signature = callGData(emailsettings, u'GetSignature', soft_errors=True, username=user)
-    try:
-      sys.stderr.write(u"User %s signature:\n  " % (user+u'@'+emailsettings.domain))
-      print convertUTF8(u" %s" % signature[u'signature'])
-    except TypeError:
-      pass
+    result = callGData(emailsettings, u'GetSignature', soft_errors=True, username=user)
+    signature = result.get(u'signature', u'None') if result else u'None'
+    if not signature:
+      signature = u'None'
+    sys.stdout.write(u"User %s signature:\n  " % (user+u'@'+emailsettings.domain))
+    print convertUTF8(u" %s" % signature)
 
 def doWebClips(users):
   if sys.argv[4].lower() in true_values: