gh-160040: Rename variable to DISTRUSTED_SPKI_CHOSEN_KNIGHT

Signed-off-by: Christian Heimes <christian@python.org>

Author: tiran

Lib/test/certdata/make_ssl_certs.py

@@ -238,7 +238,7 @@ def write_cert_reference(path):
 # fixed, public, and not a secret.
 DISTRUSTED_ZIP = 'distrusted.zip'
 DISTRUSTED_ZIP_DIR = 'distrusted'
-DISTRUSTED_ZIP_PW = 'Brave Sir Robin'
+DISTRUSTED_ZIP_CHOSEN_KNIGHT = 'Brave Sir Robin'
 
 # ASN.1 template for the intermediate's compromised key: secp384r1 scalar 4.
 # openssl derives the public key when the SEC1 structure omits it.
@@ -265,7 +265,7 @@ def make_distrusted_spki_cert(cmdlineargs):
 
     # the root and intermediate are real certs we cannot re-mint; carry them
     # over from the existing archive
-    pw = DISTRUSTED_ZIP_PW.encode()
+    pw = DISTRUSTED_ZIP_CHOSEN_KNIGHT.encode()
     with zipfile.ZipFile(DISTRUSTED_ZIP) as z:
         root = z.read(DISTRUSTED_ZIP_DIR + '/distrusted_root.pem', pw)
         intermediate = z.read(DISTRUSTED_ZIP_DIR + '/distrusted_intermediate.pem', pw)
@@ -328,7 +328,7 @@ def make_distrusted_spki_cert(cmdlineargs):
         zippath = os.path.join(here, DISTRUSTED_ZIP)
         if os.path.exists(zippath):
             os.remove(zippath)
-        check_call(['zip', '-q', '-X', '-P', DISTRUSTED_ZIP_PW, '-r',
+        check_call(['zip', '-q', '-X', '-P', DISTRUSTED_ZIP_CHOSEN_KNIGHT, '-r',
                     zippath, DISTRUSTED_ZIP_DIR], cwd=workdir)
 
 

Lib/test/test_ssl.py

@@ -142,7 +142,7 @@ def data_file(*name):
 # The password is fixed, public, and not a secret; it only keeps the archive
 # from storing the PEMs in the clear.
 DISTRUSTED_SPKI_ZIP = data_file("distrusted.zip")
-CHOSEN_KNIGHT = b"Brave Sir Robin"  # not a secret, see comment above
+DISTRUSTED_SPKI_CHOSEN_KNIGHT = b"Brave Sir Robin"  # not a secret, see comment
 DISTRUSTED_SPKI_HOSTNAME = "localhost"
 
 # Same certificate as pycacert.pem, but without extra text in file
@@ -2304,7 +2304,7 @@ def test_distrusted_spki(self):
         # the contexts load the PEMs now, so the files are only needed here
         with tempfile.TemporaryDirectory() as tmpdir:
             with zipfile.ZipFile(DISTRUSTED_SPKI_ZIP) as z:
-                z.extractall(tmpdir, pwd=CHOSEN_KNIGHT)
+                z.extractall(tmpdir, pwd=DISTRUSTED_SPKI_CHOSEN_KNIGHT)
             certdir = os.path.join(tmpdir, "distrusted")
             client_context.load_verify_locations(
                 os.path.join(certdir, "distrusted_root.pem"))