's/six\.moves\.range/range/g'

certbot-nginx/certbot_nginx/_internal/obj.py

@@ -211,7 +211,7 @@ class VirtualHost(object):
     def contains_list(self, test):
         """Determine if raw server block contains test list at top level
         """
-        for i in six.moves.range(0, len(self.raw) - len(test) + 1):
+        for i in range(0, len(self.raw) - len(test) + 1):
             if self.raw[i:i + len(test)] == test:
                 return True
         return False

certbot-nginx/tests/http_01_test.py

@@ -79,7 +79,7 @@ class HttpPerformTest(util.NginxTest):
         http_responses = self.http01.perform()
 
         self.assertEqual(len(http_responses), 4)
-        for i in six.moves.range(4):
+        for i in range(4):
             self.assertEqual(http_responses[i], acme_responses[i])
 
     def test_mod_config(self):

certbot/certbot/reverter.py

@@ -518,7 +518,7 @@ class Reverter(object):
         # It is possible save checkpoints faster than 1 per second resulting in
         # collisions in the naming convention.
 
-        for _ in six.moves.range(2):
+        for _ in range(2):
             timestamp = self._checkpoint_timestamp()
             final_dir = os.path.join(self.config.backup_dir, timestamp)
             try:

certbot/tests/main_test.py

@@ -820,7 +820,7 @@ class MainTest(test_util.ConfigTestCase):
         flags = ['--init', '--prepare', '--authenticators', '--installers']
         for args in itertools.chain(
                 *(itertools.combinations(flags, r)
-                  for r in six.moves.range(len(flags)))):
+                  for r in range(len(flags)))):
             self._call(['plugins'] + list(args))
 
     @mock.patch('certbot._internal.main.plugins_disco')

certbot/tests/storage_test.py

@@ -286,7 +286,7 @@ class RenewableCertTests(BaseRenewableCertTest):
         self.assertEqual(self.test_rc.current_version("cert"), None)
 
     def test_latest_and_next_versions(self):
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             for kind in ALL_FOUR:
                 self._write_out_kind(kind, ver)
         self.assertEqual(self.test_rc.latest_common_version(), 5)
@@ -326,7 +326,7 @@ class RenewableCertTests(BaseRenewableCertTest):
 
 
     def test_update_link_to(self):
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             for kind in ALL_FOUR:
                 self._write_out_kind(kind, ver)
                 self.assertEqual(ver, self.test_rc.current_version(kind))
@@ -353,12 +353,12 @@ class RenewableCertTests(BaseRenewableCertTest):
                          os.path.basename(self.test_rc.version("cert", 8)))
 
     def test_update_all_links_to_success(self):
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             for kind in ALL_FOUR:
                 self._write_out_kind(kind, ver)
                 self.assertEqual(ver, self.test_rc.current_version(kind))
         self.assertEqual(self.test_rc.latest_common_version(), 5)
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             self.test_rc.update_all_links_to(ver)
             for kind in ALL_FOUR:
                 self.assertEqual(ver, self.test_rc.current_version(kind))
@@ -396,11 +396,11 @@ class RenewableCertTests(BaseRenewableCertTest):
             self.assertEqual(self.test_rc.current_version(kind), 11)
 
     def test_has_pending_deployment(self):
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             for kind in ALL_FOUR:
                 self._write_out_kind(kind, ver)
                 self.assertEqual(ver, self.test_rc.current_version(kind))
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             self.test_rc.update_all_links_to(ver)
             for kind in ALL_FOUR:
                 self.assertEqual(ver, self.test_rc.current_version(kind))
@@ -498,7 +498,7 @@ class RenewableCertTests(BaseRenewableCertTest):
         # (to avoid instantiating parser)
         mock_rv.side_effect = lambda x: x
 
-        for ver in six.moves.range(1, 6):
+        for ver in range(1, 6):
             for kind in ALL_FOUR:
                 self._write_out_kind(kind, ver)
         self.test_rc.update_all_links_to(3)
@@ -529,7 +529,7 @@ class RenewableCertTests(BaseRenewableCertTest):
                 self.test_rc.version("privkey", i))))
 
         for kind in ALL_FOUR:
-            self.assertEqual(self.test_rc.available_versions(kind), list(six.moves.range(1, 9)))
+            self.assertEqual(self.test_rc.available_versions(kind), list(range(1, 9)))
             self.assertEqual(self.test_rc.current_version(kind), 3)
         # Test updating from latest version rather than old version
         self.test_rc.update_all_links_to(8)
@@ -538,7 +538,7 @@ class RenewableCertTests(BaseRenewableCertTest):
                                            b'attempt', self.config))
         for kind in ALL_FOUR:
             self.assertEqual(self.test_rc.available_versions(kind),
-                             list(six.moves.range(1, 10)))
+                             list(range(1, 10)))
             self.assertEqual(self.test_rc.current_version(kind), 8)
         with open(self.test_rc.version("fullchain", 9)) as f:
             self.assertEqual(f.read(), "last" + "attempt")

certbot/tests/util_test.py

@@ -265,7 +265,7 @@ class UniqueLineageNameTest(test_util.TempDirTestCase):
 
     def test_multiple(self):
         items = []
-        for _ in six.moves.range(10):
+        for _ in range(10):
             items.append(self._call("wow"))
         f, name = items[-1]
         self.assertTrue(isinstance(f, file_type))