deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 06:33:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Handle UTF in formatted multiline signature

Browse Source
This commit is contained in:
Ross Scroggs
2016-06-29 08:18:03 -07:00
parent acb4b39953
commit cab068357a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gam.py
View File

@ -330,6 +330,9 @@ def dehtml(text):
print_exc(file=sys.stderr) print_exc(file=sys.stderr)
return text return text
def indentMultiLineText(message, n=0):
return message.replace(u'\n', u'\n{0}'.format(u' '*n)).rstrip()
def showUsage(): def showUsage():
doGAMVersion() doGAMVersion()
print u''' print u'''
@ -5140,11 +5143,10 @@ def getSignature(users):
signature = result.get(u'signature') if result else None signature = result.get(u'signature') if result else None
if not signature: if not signature:
signature = u'None' signature = u'None'
sys.stdout.write(u"User %s signature:\n " % (user+u'@'+emailsettings.domain))
if formatSig: if formatSig:
sys.stdout.write(u"User %s signature:\n" % (user+u'@'+emailsettings.domain)) print convertUTF8(indentMultiLineText(dehtml(signature), n=2))
print dehtml(signature)
else: else:
sys.stdout.write(u"User %s signature:\n " % (user+u'@'+emailsettings.domain))
print convertUTF8(u" %s" % signature) print convertUTF8(u" %s" % signature)
def doWebClips(users): def doWebClips(users):
@ -9388,6 +9390,7 @@ def win32_unicode_argv():
# Main # Main
reload(sys) reload(sys)
if hasattr(sys, u'setdefaultencoding'):
sys.setdefaultencoding(u'UTF-8') sys.setdefaultencoding(u'UTF-8')
try: try:
if GM_Globals[GM_WINDOWS]: if GM_Globals[GM_WINDOWS]: