Revert "MAINT: Apply ruff/flake8-bugbear rule B007"

This reverts commit 77f5922.

Author: DimitriPapadopoulos

asv/commands/__init__.py

@@ -89,7 +89,7 @@ def help(args):
         common_args.add_global_arguments(subparser)
         del commands[command]
 
-    for _name, command in sorted(commands.items()):
+    for name, command in sorted(commands.items()):
         subparser = command.setup_arguments(subparsers)
         common_args.add_global_arguments(subparser)
 

asv/commands/preview.py

@@ -23,7 +23,7 @@ def random_ports(port, n):
         port = 8080
         for i in range(min(5, n)):
             yield port + i
-        for _ in range(n - 5):
+        for i in range(n - 5):
             yield max(1, port + random.randint(-2 * n, 2 * n))
 
 

asv/commands/publish.py

@@ -223,7 +223,7 @@ def copy_ignore(src, names):
 
             # Get the parameter sets for all graphs
             graph_param_list = []
-            for _path, graph in graphs:
+            for path, graph in graphs:
                 if 'summary' not in graph.params:
                     if graph.params not in graph_param_list:
                         graph_param_list.append(graph.params)

asv/commands/run.py

@@ -371,12 +371,12 @@ def iter_rounds_commits():
 
         for run_rounds, commit_hash in iter_rounds_commits():
             if commit_hash in skipped_benchmarks:
-                for _env in environments:
-                    for _bench in benchmarks:
+                for env in environments:
+                    for bench in benchmarks:
                         if interleave_rounds:
                             log.step()
                         else:
-                            for _ in range(max_rounds):
+                            for j in range(max_rounds):
                                 log.step()
                 continue
 
@@ -387,7 +387,7 @@ def iter_rounds_commits():
                         if interleave_rounds:
                             log.step()
                         else:
-                            for _ in range(max_rounds):
+                            for j in range(max_rounds):
                                 log.step()
 
             active_environments = [env for env in environments

asv/commands/update.py

@@ -35,7 +35,7 @@ def run(cls, conf, _machine_file=None):
 
         log.info("Updating results data...")
 
-        for root, _dirs, files in os.walk(conf.results_dir):
+        for root, dirs, files in os.walk(conf.results_dir):
             for filename in files:
                 path = os.path.join(root, filename)
                 if filename == 'machine.json':

asv/graph.py

@@ -429,7 +429,7 @@ def _combine_graph_data(graphs):
     ys = [[None] * len(x_idx) for j in range(n_series)]
     pos = 0
     for dataset, graph in zip(datasets, graphs):
-        for k, v, _dv in dataset:
+        for k, v, dv in dataset:
             i = x_idx[k]
             if graph.scalar_series:
                 v = [v]

asv/machine.py

@@ -16,7 +16,7 @@ def iter_machine_files(results_dir):
     """
     Iterate over all of the machine.json files in the results_dir
     """
-    for root, _dirs, files in os.walk(results_dir):
+    for root, dirs, files in os.walk(results_dir):
         for filename in files:
             if filename == 'machine.json':
                 path = os.path.join(root, filename)

asv/plugin_manager.py

@@ -25,7 +25,7 @@ def __init__(self):
 
     def load_plugins(self, package):
         prefix = package.__name__ + "."
-        for _module_finder, name, _ispkg in pkgutil.iter_modules(package.__path__, prefix):
+        for module_finder, name, ispkg in pkgutil.iter_modules(package.__path__, prefix):
             try:
                 mod = importlib.import_module(name)
                 self.init_plugin(mod)
@@ -38,7 +38,7 @@ def load_plugins(self, package):
 
     def _load_plugin_by_name(self, name):
         prefix = plugins.__name__ + "."
-        for _module_finder, module_name, _ispkg in pkgutil.iter_modules(plugins.__path__, prefix):
+        for module_finder, module_name, ispkg in pkgutil.iter_modules(plugins.__path__, prefix):
             if name in module_name:
                 mod = importlib.import_module(module_name)
                 return mod

asv/plugins/regressions.py

@@ -30,7 +30,7 @@ def publish(cls, conf, repo, benchmarks, graphs, revisions):
 
         all_params = graphs.get_params()
 
-        for file_name, graph in graphs:
+        for j, (file_name, graph) in enumerate(graphs):
             if 'summary' in graph.params:
                 continue
 
@@ -119,7 +119,7 @@ def _save_feed(cls, conf, benchmarks, data, revisions, revision_to_hash):
         # Generate feed entries
         entries = []
 
-        for name, _graph_path, graph_params, idx, last_value, best_value, jumps in data:
+        for name, graph_path, graph_params, idx, last_value, best_value, jumps in data:
             if '(' in name:
                 benchmark_name = name[:name.index('(')]
             else:

asv/results.py

@@ -22,7 +22,7 @@ def iter_results_paths(results):
     Iterate over all of the result file paths.
     """
     skip_files = {'machine.json', 'benchmarks.json'}
-    for root, _dirs, files in os.walk(results):
+    for root, dirs, files in os.walk(results):
         # Iterate over files only if machine.json is valid json
         machine_json = os.path.join(root, "machine.json")
         try:

asv/runner.py

@@ -254,7 +254,7 @@ def iter_run_items():
                     log.error(out)
 
             stderr = 'asv: benchmark suite import failed'
-            for name, benchmark, _setup_cache_key, _is_final in iter_run_items():
+            for name, benchmark, setup_cache_key, is_final in iter_run_items():
                 if name in failed_benchmarks:
                     continue
 
@@ -516,7 +516,7 @@ def run_benchmark(benchmark, spawner, profile,
     else:
         param_iter = [(0, None)]
 
-    for param_idx, _params in param_iter:
+    for param_idx, params in param_iter:
         if selected_idx is not None and param_idx not in selected_idx:
             result.append(math.nan)
             samples.append(None)

asv/step_detect.py

@@ -134,7 +134,7 @@ def detect_regressions(steps, threshold=0, min_size=2):
     short_prev = None
 
     # Find upward steps that resulted to worsened value afterward
-    for l, r, cur_v, _cur_min, cur_err in reversed(steps):
+    for l, r, cur_v, cur_min, cur_err in reversed(steps):
         threshold_step = max(cur_err, thresholded_best_err, threshold * cur_v)
 
         if thresholded_best_v > cur_v + threshold_step:

asv/template/benchmarks/benchmarks.py

@@ -13,11 +13,11 @@ def setup(self):
             self.d[x] = None
 
     def time_keys(self):
-        for _ in self.d.keys():
+        for key in self.d.keys():
             pass
 
     def time_values(self):
-        for _ in self.d.values():
+        for value in self.d.values():
             pass
 
     def time_range(self):

asv/util.py

@@ -567,7 +567,7 @@ def sig_forward(signum, frame):
                     # Terminate the whole process group
                     _killpg_safe(proc.pid, signal.SIGTERM)
 
-                    for _ in range(10):
+                    for j in range(10):
                         time.sleep(0.1)
                         if proc.poll() is not None:
                             break

pyproject.toml

@@ -127,6 +127,7 @@ extend-select = [
 ]
 ignore = [
     "B006", # TESTING
+    "B007", # TESTING
     "B020", # Loop control variable overrides iterable it iterates
     "B904", # Within an `except` clause, raise exceptions with `raise ... from err`
     "E741", # Do not use variables named 'I', 'O', or 'l'

test/benchmark/peakmem_examples.py

@@ -4,5 +4,5 @@ def peakmem_list():
     # One element takes sizeof(void*) bytes; the code below uses up
     # 4MB (32-bit) or 8MB (64-bit)
     obj = [0] * 2**20
-    for _ in obj:
+    for x in obj:
         pass

test/benchmark/subdir/time_subdir.py

@@ -4,7 +4,7 @@
 def time_foo():
     if x != 42:
         raise RuntimeError()
-    for _ in range(1000):
+    for y in range(1000):
         pass
 
 

test/benchmark/time_examples.py

@@ -16,12 +16,12 @@ def setup(self):
 
     def time_example_benchmark_1(self):
         s = ''
-        for _ in xrange(self.n):
+        for i in xrange(self.n):
             s = s + 'x'
 
     def time_example_benchmark_2(self):
         s = []
-        for _ in xrange(self.n):
+        for i in xrange(self.n):
             s.append('x')
         ''.join(s)
 

test/test_publish.py

@@ -50,7 +50,8 @@ def test_publish(tmpdir, example_results):
     only_branch = [x for x in dvcs.get_branch_hashes('some-branch')
                    if x not in main_commits]
     commits = main_commits + only_branch
-    for fn, commit in zip(result_files, commits):
+    for k, item in enumerate(zip(result_files, commits)):
+        fn, commit = item
         src = join(example_results, 'cheetah', fn)
         dst = join(result_dir, 'cheetah', commit[:8] + fn[8:])
         try:
@@ -434,7 +435,7 @@ def test_regression_atom_feed_update(dvcs_type, tmpdir):
 
     assert len(new_entries) == len(old_entries) == 2
 
-    for a, b in zip(new_entries, old_entries):
+    for j, (a, b) in enumerate(zip(new_entries, old_entries)):
         a_id = a.find('{http://www.w3.org/2005/Atom}id')
         b_id = b.find('{http://www.w3.org/2005/Atom}id')
         assert a_id.text == b_id.text

test/test_runner.py

@@ -164,7 +164,7 @@ def test_run_benchmarks(benchmarks_fixture, tmpdir):
     assert 2 <= len(times['time_examples.time_auto_repeat'].samples[0]) <= 4
 
     # Check run time timestamps
-    for result in times.values():
+    for name, result in times.items():
         assert result.started_at >= util.datetime_to_js_timestamp(start_timestamp)
         if any(x is not None for x in result.result):
             assert result.duration >= 0

test/tools.py

@@ -580,7 +580,7 @@ def run():
 
 
 def get_with_retry(browser, url):
-    for _ in range(2):
+    for j in range(2):
         try:
             return browser.get(url)
         except TimeoutException: