This is the story of a guy who discovers enumerate.

src/loadSave.py

@@ -109,9 +109,9 @@ def loadStandardItemModelXML(mdl, xml, fromString=False):
     #mdl.setHorizontalHeaderLabels(hLabels)
     
     # Populates with empty items
-    for i in range(len(vLabels)):
+    for i in enumerate(vLabels):
         row = []
-        for r in range(len(hLabels)):
+        for r in enumerate(hLabels):
             row.append(QStandardItem())
         mdl.appendRow(row)
     

src/models/persosProxyModel.py

@@ -77,8 +77,8 @@ class persosProxyModel(QSortFilterProxyModel):
         
         self._map = []
         
-        for i in range(len(self._cats)):
-            self._map.append(self._cats[i])
+        for i, cat in enumerate(self._cats):
+            self._map.append(cat)
             
             for p in range(src.rowCount()):
                 item = src.item(p, Perso.importance.value)

src/models/references.py

@@ -383,19 +383,20 @@ def linkifyAllRefs(text):
 def basicT2TFormat(text, formatting=True, EOL=True, titles=True):
     "A very basic t2t formatter to display notes and texts."
     text = text.splitlines()
-    for n in range(len(text)):
+    for n, line in enumerate(text):
         if formatting:
-            text[n] = re.sub("\*\*(.*?)\*\*", "<b>\\1</b>", text[n])
-            text[n] = re.sub("//(.*?)//", "<i>\\1</i>", text[n])
-            text[n] = re.sub("__(.*?)__", "<u>\\1</u>", text[n])
+            line = re.sub("\*\*(.*?)\*\*", "<b>\\1</b>", line)
+            line = re.sub("//(.*?)//", "<i>\\1</i>", line)
+            line = re.sub("__(.*?)__", "<u>\\1</u>", line)
+            
         if titles:
             for i in range(1, 6):
                 r1 = '^\s*{s}([^=].*[^=]){s}\s*$'.format(s="=" * i)
                 r2 = '^\s*{s}([^\+].*[^\+]){s}\s*$'.format(s="\\+" * i)
                 t = "<h{n}>\\1</h{n}>".format(n=i)
-                text[n] = re.sub(r1, t, text[n])
-                text[n] = re.sub(r2, t, text[n])
-    
+                line = re.sub(r1, t, line)
+                line = re.sub(r2, t, line)
+        text[n] = line
     text = "\n".join(text)
     if EOL:
         text = text.replace("\n", "<br>")

src/ui/editors/t2tFunctions.py

@@ -230,12 +230,12 @@ def reformatText(text, markupArray):
     rText = ""
     markup = ["**", "//", "__", "--", "``", "''"]
 
-    for k in range(len(markupArray)):
-        m = markupArray[k]
+    for k, m in enumerate(markupArray):
+        #m = markupArray[k]
         _open = False  # Are we in an _openned markup
         d = 0
         alreadySeen = []
-        for i in range(len(text)):
+        for i, t in enumerate(text):
             insert = False
             if not _open and m[i] == 1:
                 insert = True
@@ -253,23 +253,23 @@ def reformatText(text, markupArray):
                 alreadySeen.append(m[i])
             if insert:
                 rText += markup[k]
-                for j in range(len(markupArray)):
+                for j, m2 in enumerate(markupArray):
                     # The other array still have the same length
                     if j > k:
                         #Insert 2 for bold, 3 for italic, etc.
-                        markupArray[j].insert(i + d, k + 2)
-                        markupArray[j].insert(i + d, k + 2)
+                        m2.insert(i + d, k + 2)
+                        m2.insert(i + d, k + 2)
                     alreadySeen = []
                 d += 2
-            rText += text[i]
+            rText += t
         if _open:
             rText += markup[k]
-            for j in range(len(markupArray)):
+            for j, m2 in enumerate(markupArray):
                 # The other array still have the same length
                 if j > k:
                     #Insert 2 for bold, 3 for italic, etc.
-                    markupArray[j].insert(i + d, k + 2)
-                    markupArray[j].insert(i + d, k + 2)
+                    m2.insert(i + d, k + 2)
+                    m2.insert(i + d, k + 2)
         text = rText
         rText = ""
 

src/ui/editors/t2tHighlighter.py

@@ -154,8 +154,8 @@ class t2tHighlighter (basicHighlighter):
         # Tables
         for lineState in [State.TABLE_LINE, State.TABLE_HEADER]:
             if state == lineState:
-                for i in range(len(text)):
-                    if text[i] == "|":
+                for i, t in enumerate(text):
+                    if t == "|":
                         self.setFormat(i, 1, op)
                     else:
                         self.setFormat(i, 1, self.style.format(lineState))
@@ -273,7 +273,7 @@ class t2tHighlighter (basicHighlighter):
                     pos = r.indexIn(text, pos + 1)
 
             # Bold, Italic, Underline, Code, Tagged, Strikeout
-            for i in range(len(text)):
+            for i, t in enumerate(text):
                 f = self.format(i)
                 beautifiers = [k[i] for k in formatArray]
                 self.setFormat(i, 1, self.style.beautifyFormat(f, beautifiers))

src/ui/revisions.py

@@ -148,7 +148,7 @@ class revisions(QWidget, Ui_revisions):
         diff = [d for d in diff if d and not d[:2] == "? "]
         mydiff = ""
         skip = False
-        for n in range(len(diff)):
+        for n, l in enumerate(diff):
             l = diff[n]
             op = l[:2]
             txt = l[2:]