Fix ambiguous variable names

[thopre]

Summary

Fix Flake8's E741 errors (ambiguous variable name). This prevents
confusion when reading code with a font that does not distinguish
clearly between l, 1 and I.

[tnfchris]

lnt/server/reporting/report.py

11–12

lol, think it would have been about as much effort to fix :)

[thopre]

lnt/server/reporting/report.py

11–12

That's what I went for initially but change it for what? list is a keyword and creates more confusion since it's gonna be color-coded in any sensible IDE. And since the function is for any kind of list I'm not sure what else to use. I thought about "elems" but l is quite common for list comprehension AFAIK.

I welcome suggestion, I'd prefer avoiding noqa hints.

[tnfchris]

lnt/server/reporting/report.py

11–12

how about src? I mentioned because like on Phab, the highlight is quite subtle.

[thopre]

Rename variable in pairs() to avoid noqa hint

lnt/server/reporting/report.py

 """
 Common functions and classes that are used by reports.
 """
 
 import colorsys
 
 from collections import namedtuple
 
 OrderAndHistory = namedtuple('OrderAndHistory', ['max_order', 'recent_orders'])
 
 
-def pairs(l):
-    """Make an iterable of all pairs of consecutive elements in l."""
-    return zip(l[:-1], l[1:])
+def pairs(lst):
+    """Make an iterable of all pairs of consecutive elements in lst."""
+    return zip(lst[:-1], lst[1:])
 
 
 # The hash color palette avoids green and red as these colours are already used
 # in quite a few places to indicate "good" or "bad".
 _hash_color_palette = (
     colorsys.hsv_to_rgb(h=45. / 360, s=0.3, v=0.9999),  # warm yellow
     colorsys.hsv_to_rgb(h=210. / 360, s=0.3, v=0.9999),  # blue cyan
     colorsys.hsv_to_rgb(h=300. / 360, s=0.3, v=0.9999),  # mid magenta

lnt/testing/profile/perf.py

def deserialize(f, nm='nm', objdump='objdump', propagateExceptions=False):
             return None
 
         try:
             data = cPerf.importPerf(f, nm, objdump)
 
             # Go through the data and convert counter values to percentages.
             for f in data['functions'].values():
                 fc = f['counters']
-                for l in f['data']:
-                    for k, v in l[0].items():
-                        l[0][k] = 100.0 * float(v) / fc[k]
+                for inst_info in f['data']:
+                    for k, v in inst_info[0].items():
+                        inst_info[0][k] = 100.0 * float(v) / fc[k]
                 for k, v in fc.items():
                     fc[k] = 100.0 * v / data['counters'][k]
 
             return ProfileV1(data)
 
         except Exception:
             if propagateExceptions:
                 raise
             logger.warning(traceback.format_exc())
             return None

lnt/testing/profile/profilev1impl.py

def getFunctions(self):
         d = {}
         for fn in self.data['functions']:
             f = self.data['functions'][fn]
             d[fn] = dict(counters=f.get('counters', {}),
                          length=len(f.get('data', [])))
         return d
 
     def getCodeForFunction(self, fname):
-        for l in self.data['functions'][fname].get('data', []):
-            yield (l[0], l[1], l[2])
+        for inst_info in self.data['functions'][fname].get('data', []):
+            yield (inst_info[0], inst_info[1], inst_info[2])

lnt/tests/test_suite.py

def _configure(self, path, extra_cmake_defs=[], execute=True):
             if not cache.endswith(".cmake") and "/" not in cache:
                 cache = os.path.join(self._test_suite_dir(),
                                      "cmake/caches", cache + ".cmake")
             cache = os.path.abspath(cache)
             if not os.path.exists(cache):
                 fatal("Could not find CMake cache file: " + cache)
             cmake_flags += ['-C', cache]
 
-        for l in lines:
-            logger.info(l)
+        for line in lines:
+            logger.info(line)
 
         # Define compilers before specifying the cache files.
         early_defs = {}
         for key in ['CMAKE_C_COMPILER:FILEPATH',
                     'CMAKE_CXX_COMPILER:FILEPATH']:
             value = defs.pop(key, None)
             if value is not None:
                 early_defs[key] = value

lnt/util/stats.py

 
 def mean(values):
     if values:
         return sum(values) / len(values)
     else:
         return None
 
 
-def geometric_mean(l):
-    iPow = 1. / len(l)
-    return reduce(lambda a, b: a * b, [v ** iPow for v in l])
+def geometric_mean(values):
+    iPow = 1. / len(values)
+    return reduce(lambda a, b: a * b, [v ** iPow for v in values])
 
 
 def agg_mean(pairs):
     """Aggregation function in views.py receives input via enumerate and
        produces a tuple.
        Input: (value, index)
        Output: (mean, 0), or (None, None) on invalid input.
     """

tests/testing/profilev2impl.py

def test_serialize(self):
             self.assertTrue(ProfileV2.checkFile(f.name))
 
     def test_deserialize(self):
         p = ProfileV2.upgrade(ProfileV1(copy.deepcopy(self.test_data)))
         s = p.serialize()
         fobj = io.BytesIO(s)
         p2 = ProfileV2.deserialize(fobj)
 
-        l = list(p2.getCodeForFunction('fn1'))
+        l1 = list(p2.getCodeForFunction('fn1'))
         l2 = self.test_data['functions']['fn1']['data']
-        self.assertEqual(l, l2)
+        self.assertEqual(l1, l2)
 
     def test_getFunctions(self):
         p = ProfileV2.upgrade(ProfileV1(copy.deepcopy(self.test_data)))
         self.assertEqual(p.getFunctions(),
                          {'fn1': {'counters': {'cycles': 45.0, 'branch-misses': 10.0},
                                   'length': 2}})
 
 
 if __name__ == '__main__':
     unittest.main(argv=[sys.argv[0], ])