diff roundup/cgi/templating.py @ 7776:710f998c0d5b

chore: replace id with itemid the variable 'id' shadows the builtin id()
author John Rouillard <rouilj@ieee.org>
date Mon, 04 Mar 2024 19:09:13 -0500
parents b8e63e65d9a8
children 173cc61d7474
line wrap: on
line diff
--- a/roundup/cgi/templating.py	Mon Mar 04 18:51:41 2024 -0500
+++ b/roundup/cgi/templating.py	Mon Mar 04 19:09:13 2024 -0500
@@ -838,9 +838,9 @@
         if not check('Web Access', userid):
             return []
 
-        class_list = [HTMLItem(self._client, self._classname, id)
-                      for id in class_list if
-                      check('View', userid, self._classname, itemid=id)]
+        class_list = [HTMLItem(self._client, self._classname, itemid)
+                      for itemid in class_list if
+                      check('View', userid, self._classname, itemid=itemid)]
 
         return class_list
 
@@ -903,9 +903,10 @@
         if not check('Web Access', userid):
             return []
 
-        filtered = [HTMLItem(self._client, self.classname, id)
-                    for id in self._klass.filter(None, filterspec, sort, group)
-                    if check('View', userid, self.classname, itemid=id)]
+        filtered = [HTMLItem(self._client, self.classname, itemid)
+                    for itemid in self._klass.filter(None, filterspec,
+                                                     sort, group)
+                    if check('View', userid, self.classname, itemid=itemid)]
         return filtered
 
     def classhelp(self, properties=None, label=''"(list)", width='500',
@@ -1700,7 +1701,7 @@
             return self._hyper_repl_email(match, '<a href="mailto:%s">%s</a>')
         elif len(match.group('id')) < 10:
             return self._hyper_repl_item(
-                match, '<a href="%(cls)s%(id)s%(fragment)s">%(item)s</a>')
+                match, '<a href="%(cls)s%(itemid)s%(fragment)s">%(item)s</a>')
         else:
             # just return the matched text
             return match.group(0)
@@ -1733,14 +1734,14 @@
     def _hyper_repl_item(self, match, replacement):
         item = match.group('item')
         cls = match.group('class').lower()
-        id = match.group('id')
+        itemid = match.group('id')
         fragment = match.group('fragment')
         if fragment is None:
             fragment = ""
         try:
             # make sure cls is a valid tracker classname
             cl = self._db.getclass(cls)
-            if not cl.hasnode(id):
+            if not cl.hasnode(itemid):
                 return item
             return replacement % locals()
         except KeyError:
@@ -1754,7 +1755,7 @@
             s = match.group('email')
             return '`%s <mailto:%s>`_' % (s, s)
         elif len(match.group('id')) < 10:
-            return self._hyper_repl_item(match, '`%(item)s <%(cls)s%(id)s>`_')
+            return self._hyper_repl_item(match, '`%(item)s <%(cls)s%(itemid)s>`_')
         else:
             # just return the matched text
             return match.group(0)
@@ -1795,7 +1796,7 @@
                     if (prefix, suffix) in {('(', ')')}:
                         if match.string[start-1] == ']':
                             return match.group(0)
-            return self._hyper_repl_item(match, '[%(item)s](%(cls)s%(id)s)')
+            return self._hyper_repl_item(match, '[%(item)s](%(cls)s%(itemid)s)')
         else:
             # just return the matched text
             return match.group(0)

Roundup Issue Tracker: http://roundup-tracker.org/