From 6d1105da81f570c5030578c92a96d0651bb15a0f Mon Sep 17 00:00:00 2001
From: Baizley <Baizley@users.noreply.github.com>
Date: Sat, 1 Feb 2020 00:28:59 +0100
Subject: [PATCH] Correct enumerations unpacking.

---
 gramps/gen/filters/rules/_rule.py            |  8 ++++----
 gramps/gen/lib/test/date_test.py             |  6 +++---
 gramps/gen/plug/report/_book.py              |  2 +-
 gramps/gen/plug/report/_options.py           |  4 ++--
 gramps/gui/editors/displaytabs/surnametab.py |  4 ++--
 gramps/gui/selectors/baseselector.py         |  6 +++---
 gramps/gui/views/listview.py                 |  2 +-
 gramps/gui/widgets/fanchart.py               | 16 ++++++++--------
 gramps/gui/widgets/grampletpane.py           |  2 +-
 gramps/plugins/docgen/cairodoc.py            |  2 +-
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gramps/gen/filters/rules/_rule.py b/gramps/gen/filters/rules/_rule.py
index 42e8371c9..59f71011d 100644
--- a/gramps/gen/filters/rules/_rule.py
+++ b/gramps/gen/filters/rules/_rule.py
@@ -81,12 +81,12 @@ class Rule:
         if self.nrprepare == 0:
             if self.use_regex:
                 self.regex = [None]*len(self.labels)
-                for i in enumerate(self.labels):
-                    if self.list[i]:
+                for index, label in enumerate(self.labels):
+                    if self.list[index]:
                         try:
-                            self.regex[i] = re.compile(self.list[i], re.I)
+                            self.regex[index] = re.compile(self.list[index], re.I)
                         except re.error:
-                            self.regex[i] = re.compile('')
+                            self.regex[index] = re.compile('')
                 self.match_substring = self.match_regex
             self.prepare(db, user)
         self.nrprepare += 1
diff --git a/gramps/gen/lib/test/date_test.py b/gramps/gen/lib/test/date_test.py
index 7d101be75..8b21454db 100644
--- a/gramps/gen/lib/test/date_test.py
+++ b/gramps/gen/lib/test/date_test.py
@@ -235,8 +235,8 @@ class ParserDateTest(BaseDateTest):
     Date displayer and parser tests.
     """
     def do_case(self, testset):
-        for date_format in enumerate(get_date_formats()):
-            set_format(date_format)
+        for index, date_format in enumerate(get_date_formats()):
+            set_format(index)
 
             for dateval in date_tests[testset]:
                 datestr = _dd.display(dateval)
@@ -245,7 +245,7 @@ class ParserDateTest(BaseDateTest):
                                 "dateval fails is_equal in format %d:\n"
                                 "   '%s' != '%s'\n"
                                 "   '%s' != '%s'\n" %
-                                (date_format, dateval, ndate,
+                                (index, dateval, ndate,
                                  dateval.__dict__, ndate.__dict__))
 
     def test_basic(self):
diff --git a/gramps/gen/plug/report/_book.py b/gramps/gen/plug/report/_book.py
index b8711b8d4..24d560e62 100644
--- a/gramps/gen/plug/report/_book.py
+++ b/gramps/gen/plug/report/_book.py
@@ -556,7 +556,7 @@ class BookList:
                     b_f.write('    <size value="%f %f"/>'
                               '\n' % (size[0], size[1]))
                 if book.get_margins():
-                    for pos in enumerate(book.get_margins()):
+                    for pos, margin in enumerate(book.get_margins()):
                         b_f.write('    <margin number="%s" '
                                   'value="%f"/>\n' % (
                                       pos, book.get_margin(pos)))
diff --git a/gramps/gen/plug/report/_options.py b/gramps/gen/plug/report/_options.py
index 2e8869a64..d29ccb4c9 100644
--- a/gramps/gen/plug/report/_options.py
+++ b/gramps/gen/plug/report/_options.py
@@ -497,9 +497,9 @@ class OptionListCollection(_options.OptionListCollection):
                                % (size[0], size[1]))
                 if option_list.get_margins():
                     margins = option_list.get_margins()
-                    for pos in enumerate(margins):
+                    for pos, margin in enumerate(margins):
                         file.write('  <margin number="%s" value="%f"/>\n'
-                                   % (pos, margins[pos]))
+                                   % (pos, margin))
 
         if option_list.get_style_name():
             file.write('  <style name="%s"/>\n'
diff --git a/gramps/gui/editors/displaytabs/surnametab.py b/gramps/gui/editors/displaytabs/surnametab.py
index f4b902625..f1b5014f4 100644
--- a/gramps/gui/editors/displaytabs/surnametab.py
+++ b/gramps/gui/editors/displaytabs/surnametab.py
@@ -178,7 +178,7 @@ class SurnameTab(EmbeddedList):
         the model
         """
         new_list = []
-        for idx in enumerate(self.model):
+        for idx, value in enumerate(self.model):
             node = self.model.get_iter(idx)
             surn = self.model.get_value(node, 5)
             surn.set_prefix(self.model.get_value(node, 0))
@@ -310,7 +310,7 @@ class SurnameTab(EmbeddedList):
         #obtain current value
         node = self.model.get_iter(path)
         old_val = self.model.get_value(node, colnr)
-        for nr in enumerate(self.obj.get_surname_list()):
+        for nr, surname in enumerate(self.obj.get_surname_list()):
             if nr == int(path[0]):
                 if old_val:
                     #True remains True
diff --git a/gramps/gui/selectors/baseselector.py b/gramps/gui/selectors/baseselector.py
index 5d0ad0693..df5606853 100644
--- a/gramps/gui/selectors/baseselector.py
+++ b/gramps/gui/selectors/baseselector.py
@@ -149,7 +149,7 @@ class BaseSelector(ManagedWindow):
                     parent_path = self.model.get_path(parent_iter)
                     if parent_path:
                         parent_path_list = parent_path.get_indices()
-                        for i in enumerate(parent_path_list):
+                        for i, value in enumerate(parent_path_list):
                             expand_path = Gtk.TreePath(
                                     tuple([x for x in parent_path_list[:i+1]]))
                             self.tree.expand_row(expand_path, False)
@@ -301,9 +301,9 @@ class BaseSelector(ManagedWindow):
 
         #sorting arrow in column header (not on start, only on click)
         if not self.setupcols :
-            for i in enumerate(self.columns):
+            for i, column in enumerate(self.columns):
                 enable_sort_flag = (i==self.sort_col)
-                self.columns[i].set_sort_indicator(enable_sort_flag)
+                column.set_sort_indicator(enable_sort_flag)
             self.columns[self.sort_col].set_sort_order(self.sortorder)
 
         # set the search column to be the sorted column
diff --git a/gramps/gui/views/listview.py b/gramps/gui/views/listview.py
index 9422bd534..b44804f02 100644
--- a/gramps/gui/views/listview.py
+++ b/gramps/gui/views/listview.py
@@ -423,7 +423,7 @@ class ListView(NavigationView):
                     parent_path = self.model.get_path(parent_iter)
                     if parent_path:
                         parent_path_list = parent_path.get_indices()
-                        for i in enumerate(parent_path_list):
+                        for i, value in enumerate(parent_path_list):
                             expand_path = Gtk.TreePath(
                                     tuple([x for x in parent_path_list[:i+1]]))
                             self.list.expand_row(expand_path, False)
diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py
index 6fe74356a..a5f6c333b 100644
--- a/gramps/gui/widgets/fanchart.py
+++ b/gramps/gui/widgets/fanchart.py
@@ -397,9 +397,9 @@ class FanChartBaseWidget(Gtk.DrawingArea):
             divs = [x/(steps-1) for x in range(steps)]
             self.gradval = ['%d' % int(self.minperiod + x *
                                        periodrange) for x in divs]
-            for i in range(len(self.gradval)):
-                if i % 2 == 1:
-                    self.gradval[i] = ''
+            for index, value in enumerate(self.gradval):
+                if index % 2 == 1:
+                    self.gradval[index] = ''
             self.gradcol = [colorsys.hsv_to_rgb(
                 (1-div) * self.cstart_hsv[0] + div * self.cend_hsv[0],
                 (1-div) * self.cstart_hsv[1] + div * self.cend_hsv[1],
@@ -422,9 +422,9 @@ class FanChartBaseWidget(Gtk.DrawingArea):
             divs = [x/(steps-1) for x in range(steps)]
             self.gradval = ['%d' % int(x * MAX_AGE) for x in divs]
             self.gradval[-1] = '%d+' % MAX_AGE
-            for i in enumerate(self.gradval):
-                if i % 2 == 1:
-                    self.gradval[i] = ''
+            for index, value in enumerate(self.gradval):
+                if index % 2 == 1:
+                    self.gradval[index] = ''
             self.gradcol = [colorsys.hsv_to_rgb(
                 (1-div) * self.cstart_hsv[0] + div * self.cend_hsv[0],
                 (1-div) * self.cstart_hsv[1] + div * self.cend_hsv[1],
@@ -1397,7 +1397,7 @@ class FanChartWidget(FanChartBaseWidget):
         """
         #compute the number of generations present
         for generation in range(self.generations - 1, 0, -1):
-            for (person, *rest) in self.data[generation]:
+            for person, *rest in self.data[generation]:
                 if person:
                     return generation
         return 1
@@ -1421,7 +1421,7 @@ class FanChartWidget(FanChartBaseWidget):
         a generator over all people outside of the core person
         """
         for generation in range(self.generations):
-            for (person, dummy_parents, dummy_child, userdata) in self.data[generation]:
+            for person, dummy_parents, dummy_child, userdata in self.data[generation]:
                 yield person, userdata
 
     def innerpeople_generator(self):
diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py
index cdfcf31f1..25b81866d 100644
--- a/gramps/gui/widgets/grampletpane.py
+++ b/gramps/gui/widgets/grampletpane.py
@@ -1309,7 +1309,7 @@ class GrampletPane(Gtk.ScrolledWindow):
             x = sx - x
         # first, find column:
         col = 0
-        for i in enumerate(self.columns):
+        for i, column in enumerate(self.columns):
             if x < (sx/len(self.columns) * (i + 1)):
                 col = i
                 break
diff --git a/gramps/plugins/docgen/cairodoc.py b/gramps/plugins/docgen/cairodoc.py
index eb689aa9f..78e89c06d 100644
--- a/gramps/plugins/docgen/cairodoc.py
+++ b/gramps/plugins/docgen/cairodoc.py
@@ -184,7 +184,7 @@ class CairoDocgen(libcairodoc.CairoDoc):
                     body_pages = body_pages[:index_page] + index_pages + \
                                  body_pages[index_page+1:]
                 self._pages = body_pages
-                for page_nr in enumerate(self._pages):
+                for page_nr, page in enumerate(self._pages):
                     cr.save()
                     cr.translate(left_margin, top_margin)
                     self.draw_page(page_nr, cr, layout,