mirror of
https://github.com/GAM-team/GAM.git
synced 2025-07-09 06:03:35 +00:00
Merge branch 'master' of https://github.com/jay0lee/GAM
This commit is contained in:
@ -4703,8 +4703,8 @@ def printShowSmime(users, csvFormat):
|
|||||||
for sendAsEmail in sendAsEmails:
|
for sendAsEmail in sendAsEmails:
|
||||||
result = callGAPI(gmail.users().settings().sendAs().smimeInfo(), u'list', sendAsEmail=sendAsEmail, userId=u'me')
|
result = callGAPI(gmail.users().settings().sendAs().smimeInfo(), u'list', sendAsEmail=sendAsEmail, userId=u'me')
|
||||||
smimes = result.get(u'smimeInfo', [])
|
smimes = result.get(u'smimeInfo', [])
|
||||||
for i, _ in enumerate(smimes):
|
for j, _ in enumerate(smimes):
|
||||||
smimes[i][u'expiration'] = datetime.datetime.fromtimestamp(int(smimes[i][u'expiration'])/1000).strftime('%Y-%m-%d %H:%M:%S')
|
smimes[j][u'expiration'] = datetime.datetime.fromtimestamp(int(smimes[j][u'expiration'])/1000).strftime('%Y-%m-%d %H:%M:%S')
|
||||||
if csvFormat:
|
if csvFormat:
|
||||||
for smime in smimes:
|
for smime in smimes:
|
||||||
addRowTitlesToCSVfile(flatten_json(smime, flattened={u'User': user}), csvRows, titles)
|
addRowTitlesToCSVfile(flatten_json(smime, flattened={u'User': user}), csvRows, titles)
|
||||||
|
Reference in New Issue
Block a user