Clean signature printing

This commit is contained in:
Ross Scroggs
2016-01-01 14:39:10 -08:00
parent c0ee674060
commit acb21cb926

View File

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