Prepare release tools for python 3

- Sort dictionaries before looping over them
- Don't call sorted() on lists with Nones
- Open file in binary format when serializing protobufs

Change-Id: If5dbc908f7125f6184014b3c1c7891f833d1d8bf
Bug: 203436762
Test: Presubmits
This commit is contained in:
Cole Faust
2021-10-28 13:59:48 -07:00
parent 936e704999
commit b820bcd829
3 changed files with 14 additions and 4 deletions

View File

@@ -2105,7 +2105,9 @@ def GetKeyPasswords(keylist):
need_passwords = []
key_passwords = {}
devnull = open("/dev/null", "w+b")
for k in sorted(keylist):
# sorted() can't compare strings to None, so convert Nones to strings
for k in sorted(keylist, key=lambda x: x if x is not None else ""):
# We don't need a password for things that aren't really keys.
if k in SPECIAL_CERT_STRINGS or k is None:
no_passwords.append(k)