diff --git a/src/loadSave.py b/src/loadSave.py
index a25de9d4..f8ee3637 100644
--- a/src/loadSave.py
+++ b/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)
diff --git a/src/models/persosProxyModel.py b/src/models/persosProxyModel.py
index 6126d6eb..6e4a70c7 100644
--- a/src/models/persosProxyModel.py
+++ b/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)
diff --git a/src/models/references.py b/src/models/references.py
index d9fcfb56..f98b4069 100644
--- a/src/models/references.py
+++ b/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("\*\*(.*?)\*\*", "\\1", text[n])
- text[n] = re.sub("//(.*?)//", "\\1", text[n])
- text[n] = re.sub("__(.*?)__", "\\1", text[n])
+ line = re.sub("\*\*(.*?)\*\*", "\\1", line)
+ line = re.sub("//(.*?)//", "\\1", line)
+ line = re.sub("__(.*?)__", "\\1", 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 = "\\1".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", "
")
diff --git a/src/ui/editors/t2tFunctions.py b/src/ui/editors/t2tFunctions.py
index 96e8cf12..4c7a2690 100644
--- a/src/ui/editors/t2tFunctions.py
+++ b/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 = ""
diff --git a/src/ui/editors/t2tHighlighter.py b/src/ui/editors/t2tHighlighter.py
index 3719ea2e..05235975 100644
--- a/src/ui/editors/t2tHighlighter.py
+++ b/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))
diff --git a/src/ui/revisions.py b/src/ui/revisions.py
index 2601a27d..2c4af0d6 100644
--- a/src/ui/revisions.py
+++ b/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:]