upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 06:42:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix six.moves.zip

Browse source
This commit is contained in:
Brad Warren 2021-02-08 12:02:26 -08:00
parent 684ecc59b9
commit 4156db09e9
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
certbot-apache/certbot_apache/_internal/parser.py
View file

@ -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)

6
certbot/certbot/_internal/renewal.py
View file

@ -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])

2
certbot/certbot/tests/acme_util.py
View file

@ -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(

2
certbot/tests/reverter_test.py
View file

@ -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):