python: examples bugfix
* Fixed a bug in the ProtonMail importers (pmkey-*.py) where multiple keys found for a username would always result in the last email address checked being returned in the printed output for all located keys.
This commit is contained in:
parent
3849b60e22
commit
4308d17281
@ -110,6 +110,12 @@ for k in ksearch:
|
||||
new_uids = result.new_user_ids
|
||||
new_scrt = result.secret_imported
|
||||
nochange = result.unchanged
|
||||
|
||||
def knom():
|
||||
for ki in result.imports:
|
||||
for ku in c.get_key(ki.fpr).uids:
|
||||
return ku.uid
|
||||
|
||||
print("""
|
||||
The total number of keys considered for import was: {0}
|
||||
|
||||
@ -125,7 +131,7 @@ Number of new secret keys: {6}
|
||||
Number of unchanged keys: {7}
|
||||
|
||||
The key IDs for all considered keys were:
|
||||
""".format(num_keys, k, new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
""".format(num_keys, knom(), new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
nochange))
|
||||
for i in range(num_keys):
|
||||
print(result.imports[i].fpr)
|
||||
|
@ -147,6 +147,12 @@ for result in results:
|
||||
new_uids = result.new_user_ids
|
||||
new_scrt = result.secret_imported
|
||||
nochange = result.unchanged
|
||||
|
||||
def knom():
|
||||
for ki in result.imports:
|
||||
for ku in c.get_key(ki.fpr).uids:
|
||||
return ku.uid
|
||||
|
||||
print("""
|
||||
The total number of keys considered for import was: {0}
|
||||
|
||||
@ -162,7 +168,7 @@ Number of new secret keys: {6}
|
||||
Number of unchanged keys: {7}
|
||||
|
||||
The key IDs for all considered keys were:
|
||||
""".format(num_keys, k, new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
""".format(num_keys, knom(), new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
nochange))
|
||||
for i in range(num_keys):
|
||||
print(result.imports[i].fpr)
|
||||
|
@ -110,10 +110,16 @@ for result in results:
|
||||
new_uids = result.new_user_ids
|
||||
new_scrt = result.secret_imported
|
||||
nochange = result.unchanged
|
||||
|
||||
def knom():
|
||||
for ki in result.imports:
|
||||
for ku in c.get_key(ki.fpr).uids:
|
||||
return ku.uid
|
||||
|
||||
print("""
|
||||
The total number of keys considered for import was: {0}
|
||||
|
||||
With UIDs wholely or partially matching the following string:
|
||||
With UIDs wholely or partially matching the following string(s):
|
||||
|
||||
{1}
|
||||
|
||||
@ -125,7 +131,7 @@ Number of new secret keys: {6}
|
||||
Number of unchanged keys: {7}
|
||||
|
||||
The key IDs for all considered keys were:
|
||||
""".format(num_keys, k, new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
""".format(num_keys, knom(), new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
nochange))
|
||||
for i in range(num_keys):
|
||||
print(result.imports[i].fpr)
|
||||
|
@ -94,6 +94,12 @@ for k in ksearch:
|
||||
new_uids = result.new_user_ids
|
||||
new_scrt = result.secret_imported
|
||||
nochange = result.unchanged
|
||||
|
||||
def knom():
|
||||
for ki in result.imports:
|
||||
for ku in c.get_key(ki.fpr).uids:
|
||||
return ku.uid
|
||||
|
||||
print("""
|
||||
The total number of keys considered for import was: {0}
|
||||
|
||||
@ -109,7 +115,7 @@ Number of new secret keys: {6}
|
||||
Number of unchanged keys: {7}
|
||||
|
||||
The key IDs for all considered keys were:
|
||||
""".format(num_keys, k, new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
""".format(num_keys, knom(), new_revs, new_sigs, new_subs, new_uids, new_scrt,
|
||||
nochange))
|
||||
for i in range(num_keys):
|
||||
print(result.imports[i].fpr)
|
||||
|
Loading…
Reference in New Issue
Block a user