From 4156db09e9db5d4082acf65bfccdd6a163fffb43 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 8 Feb 2021 12:02:26 -0800
Subject: [PATCH] fix six.moves.zip

---
 certbot-apache/certbot_apache/_internal/parser.py | 2 +-
 certbot/certbot/_internal/renewal.py              | 6 +++---
 certbot/certbot/tests/acme_util.py                | 2 +-
 certbot/tests/reverter_test.py                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/certbot-apache/certbot_apache/_internal/parser.py b/certbot-apache/certbot_apache/_internal/parser.py
index 4d997545b..c997d0dc8 100644
--- a/certbot-apache/certbot_apache/_internal/parser.py
+++ b/certbot-apache/certbot_apache/_internal/parser.py
@@ -275,7 +275,7 @@ class ApacheParser(object):
         while len(mods) != prev_size:
             prev_size = len(mods)
 
-            for match_name, match_filename in six.moves.zip(
+            for match_name, match_filename in zip(
                     iterator, iterator):
                 mod_name = self.get_arg(match_name)
                 mod_filename = self.get_arg(match_filename)
diff --git a/certbot/certbot/_internal/renewal.py b/certbot/certbot/_internal/renewal.py
index f4c7b4502..33adf7889 100644
--- a/certbot/certbot/_internal/renewal.py
+++ b/certbot/certbot/_internal/renewal.py
@@ -180,9 +180,9 @@ def restore_required_config_elements(config, renewalparams):
 
     required_items = itertools.chain(
         (("pref_challs", _restore_pref_challs),),
-        six.moves.zip(BOOL_CONFIG_ITEMS, itertools.repeat(_restore_bool)),
-        six.moves.zip(INT_CONFIG_ITEMS, itertools.repeat(_restore_int)),
-        six.moves.zip(STR_CONFIG_ITEMS, itertools.repeat(_restore_str)))
+        zip(BOOL_CONFIG_ITEMS, itertools.repeat(_restore_bool)),
+        zip(INT_CONFIG_ITEMS, itertools.repeat(_restore_int)),
+        zip(STR_CONFIG_ITEMS, itertools.repeat(_restore_str)))
     for item_name, restore_func in required_items:
         if item_name in renewalparams and not cli.set_by_cli(item_name):
             value = restore_func(item_name, renewalparams[item_name])
diff --git a/certbot/certbot/tests/acme_util.py b/certbot/certbot/tests/acme_util.py
index f4a20ea86..ce947e880 100644
--- a/certbot/certbot/tests/acme_util.py
+++ b/certbot/certbot/tests/acme_util.py
@@ -69,7 +69,7 @@ def gen_authzr(authz_status, domain, challs, statuses, combos=True):
     """
     challbs = tuple(
         chall_to_challb(chall, status)
-        for chall, status in six.moves.zip(challs, statuses)
+        for chall, status in zip(challs, statuses)
     )
     authz_kwargs = {
         "identifier": messages.Identifier(
diff --git a/certbot/tests/reverter_test.py b/certbot/tests/reverter_test.py
index d67aa431a..1e3d51a37 100644
--- a/certbot/tests/reverter_test.py
+++ b/certbot/tests/reverter_test.py
@@ -156,7 +156,7 @@ class ReverterCheckpointLocalTest(test_util.ConfigTestCase):
 
         act_coms = get_undo_commands(self.config.temp_checkpoint_dir)
 
-        for a_com, com in six.moves.zip(act_coms, coms):
+        for a_com, com in zip(act_coms, coms):
             self.assertEqual(a_com, com)
 
     def test_bad_register_undo_command(self):