Aply consistent source formatting (autopep8)

stevenyoungs · stevenyoungs · commit 6b4bfabfa6af · 2020-01-02T21:21:11.000Z
diff --git a/Form/UK1841.py b/Form/UK1841.py
@@ -18,11 +18,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Gramps modules
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 from gramps.gen.datehandler import displayer as date_displayer
 from gramps.gen.db import DbTxn
 from gramps.gen.display.name import displayer as name_displayer
@@ -31,18 +31,18 @@
                             Name, Person)
 from gramps.gen.utils.db import get_participant_from_event
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Gramplet modules
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 import actionutils
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Internationalisation
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 try:
     _trans = glocale.get_addon_translator(__file__)
@@ -51,27 +51,30 @@
 
 _ = _trans.gettext
 
+
 def get_actions(dbstate, citation, form_event):
     """
     return a list of all actions that this module can provide for the given citation and form
     each list entry is a string, describing the action category, and a list of actions that can be performed.
     """
     actions = []
-    actions.append(PrimaryNameCitation.get_actions(dbstate, citation, form_event))
+    actions.append(PrimaryNameCitation.get_actions(
+        dbstate, citation, form_event))
     actions.append(AlternateName.get_actions(dbstate, citation, form_event))
     actions.append(BirthEvent.get_actions(dbstate, citation, form_event))
     actions.append(OccupationEvent.get_actions(dbstate, citation, form_event))
     actions.append(ResidenceEvent.get_actions(dbstate, citation, form_event))
     return actions
 
+
 class PrimaryNameCitation:
     @staticmethod
     def get_actions(dbstate, citation, form_event):
         db = dbstate.db
         actions = []
         for (person, attr) in actionutils.get_form_person_attr(db, form_event.get_handle(), 'Name'):
             actions.append((name_displayer.display(person), attr.get_value(),
-                         lambda dbstate, uistate, track, citation_handle = citation.handle, person_handle = person.handle: PrimaryNameCitation.command(dbstate, uistate, track, citation_handle, person_handle)))
+                            lambda dbstate, uistate, track, citation_handle=citation.handle, person_handle=person.handle: PrimaryNameCitation.command(dbstate, uistate, track, citation_handle, person_handle)))
         return (_("Add Primary Name citation"), actions)
 
     @staticmethod
@@ -82,6 +85,7 @@ def command(dbstate, uistate, track, citation_handle, person_handle):
         with DbTxn(_("Add Person ({name})").format(name=name_displayer.display(person)), db) as trans:
             db.commit_person(person, trans)
 
+
 class AlternateName:
     @staticmethod
     def get_actions(dbstate, citation, form_event):
@@ -93,7 +97,7 @@ def get_actions(dbstate, citation, form_event):
             alternate.add_citation(citation.handle)
             detail = _('Given Name: {name}').format(name=attr.get_value())
             actions.append((name_displayer.display(person), detail,
-                         lambda dbstate, uistate, track, person_handle = person.handle, alternate_ = alternate: AlternateName.command(dbstate, uistate, track, person_handle, alternate_)))
+                            lambda dbstate, uistate, track, person_handle=person.handle, alternate_=alternate: AlternateName.command(dbstate, uistate, track, person_handle, alternate_)))
         return (_("Add alternate name"), actions)
 
     @staticmethod
@@ -104,6 +108,7 @@ def command(dbstate, uistate, track, person_handle, alternate):
         with DbTxn(_("Add Person ({name})").format(name=name_displayer.display(person)), db) as trans:
             db.commit_person(person, trans)
 
+
 class BirthEvent:
     @staticmethod
     def get_actions(dbstate, citation, form_event):
@@ -126,26 +131,31 @@ def get_actions(dbstate, citation, form_event):
                         elif not birth_date.is_compound():
                             # in theory, birth_date will never be compound since 1841 census date was 1841-06-06. Let's handle it anyway.
                             # create a compound range spanning the possible birth years
-                            birth_range = (birth_date - 5).get_dmy() + (False,) + birth_date.get_dmy() + (False,)
-                            birth_date.set(Date.QUAL_NONE, Date.MOD_RANGE, birth_date.get_calendar(), birth_range, newyear=birth_date.get_new_year())
+                            birth_range = (birth_date - 5).get_dmy() + \
+                                (False,) + birth_date.get_dmy() + (False,)
+                            birth_date.set(Date.QUAL_NONE, Date.MOD_RANGE, birth_date.get_calendar(
+                            ), birth_range, newyear=birth_date.get_new_year())
                         birth_date.set_quality(Date.QUAL_CALCULATED)
-                        detail = _('Age: {age}\nDate: {date}').format(age=age_string, date=date_displayer.display(birth_date))
+                        detail = _('Age: {age}\nDate: {date}').format(
+                            age=age_string, date=date_displayer.display(birth_date))
                         actions.append((name_displayer.display(person), detail,
-                                        lambda dbstate, uistate, track, citation_handle = citation.handle, person_handle = person.handle, birth_date_ = birth_date: actionutils.add_event_to_person(dbstate, uistate, track, person_handle, EventType.BIRTH, birth_date_, None, citation_handle, EventRoleType.PRIMARY)))
+                                        lambda dbstate, uistate, track, citation_handle=citation.handle, person_handle=person.handle, birth_date_=birth_date: actionutils.add_event_to_person(dbstate, uistate, track, person_handle, EventType.BIRTH, birth_date_, None, citation_handle, EventRoleType.PRIMARY)))
         return (_("Add Birth event"), actions)
 
+
 class OccupationEvent:
     @staticmethod
     def get_actions(dbstate, citation, form_event):
         db = dbstate.db
         actions = []
         for (person, attr) in actionutils.get_form_person_attr(db, form_event.get_handle(), 'Occupation'):
             occupation = attr.get_value()
-            if (occupation) :
+            if (occupation):
                 actions.append((name_displayer.display(person), _('Description: {occupation}').format(occupation=occupation),
-                         lambda dbstate, uistate, track, citation_handle = citation.handle, person_handle = person.handle, occupation_ = occupation: actionutils.add_event_to_person(dbstate, uistate, track, person_handle, EventType.OCCUPATION, form_event.get_date_object(), occupation_, citation_handle, EventRoleType.PRIMARY)))
+                                lambda dbstate, uistate, track, citation_handle=citation.handle, person_handle=person.handle, occupation_=occupation: actionutils.add_event_to_person(dbstate, uistate, track, person_handle, EventType.OCCUPATION, form_event.get_date_object(), occupation_, citation_handle, EventRoleType.PRIMARY)))
         return (_("Add Occupation event"), actions)
 
+
 class ResidenceEvent:
     @staticmethod
     def get_actions(dbstate, citation, form_event):
@@ -162,10 +172,11 @@ def get_actions(dbstate, citation, form_event):
         if people:
             detail = None
             if form_event.get_place_handle():
-                place = place_displayer.display(db, db.get_place_from_handle(form_event.get_place_handle()))
+                place = place_displayer.display(
+                    db, db.get_place_from_handle(form_event.get_place_handle()))
                 detail = _('Place: {place}').format(place=place)
             actions.append((get_participant_from_event(db, form_event.get_handle()), detail,
-                         lambda dbstate, uistate, track, citation_handle = citation.handle, people_handles = people: ResidenceEvent.command(dbstate, uistate, track, citation_handle, form_event.get_date_object(), form_event.get_place_handle(), people_handles)))
+                            lambda dbstate, uistate, track, citation_handle=citation.handle, people_handles=people: ResidenceEvent.command(dbstate, uistate, track, citation_handle, form_event.get_date_object(), form_event.get_place_handle(), people_handles)))
         return (_("Add Residence event"), actions)
 
     @staticmethod
diff --git a/Form/actionutils.py b/Form/actionutils.py
@@ -18,21 +18,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Gramps modules
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 from gramps.gen.db import DbTxn
 from gramps.gen.display.name import displayer as name_displayer
 from gramps.gen.lib import (Event, EventType, EventRef, EventRoleType,
                             Person)
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Internationalisation
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 try:
     _trans = glocale.get_addon_translator(__file__)
@@ -41,6 +41,7 @@
 
 _ = _trans.gettext
 
+
 def add_event_to_person(dbstate, uistate, track, person_handle, event_type, event_date_object, event_description, citation_handle, event_role_type):
     db = dbstate.db
     """
@@ -64,6 +65,7 @@ def add_event_to_person(dbstate, uistate, track, person_handle, event_type, even
     with DbTxn(_("Add Event ({name})").format(name=name_displayer.display(person)), db) as trans:
         db.commit_person(person, trans)
 
+
 def get_form_person_attr(db, form_event_handle, attr_type):
     """
     Find all persons referencing the form_event and which have an attribute of type attr_type
@@ -80,6 +82,7 @@ def get_form_person_attr(db, form_event_handle, attr_type):
                         result.append((person, attr))
     return result
 
+
 def represents_int(s):
     """
     return True iff s is convertable to an int, False otherwise
diff --git a/Form/formactions.py b/Form/formactions.py
@@ -21,62 +21,69 @@
 """
 Form action chooser
 """
-#-------------------------------------------------------------------------
+# -------------------------------------------------------------------------
 #
 # Standard Python modules
 #
-#-------------------------------------------------------------------------
+# -------------------------------------------------------------------------
 import logging
 import importlib.util
 import inspect
 import os
 import sys
 
-LOG = logging.getLogger('.form')
-
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # GTK modules
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 from gi.repository import Gtk, GObject
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Gramps modules
 #
-#------------------------------------------------------------------------
-from gramps.gui.managedwindow import ManagedWindow
+# ------------------------------------------------------------------------
 from gramps.gen.config import config
+from gramps.gen.const import GRAMPS_LOCALE as glocale
 from gramps.gen.datehandler import get_date
 from gramps.gen.db import DbTxn
 from gramps.gui.display import display_help
+from gramps.gui.managedwindow import ManagedWindow
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # Gramplet modules
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 from editform import find_form_event
 from form import (get_form_id, get_form_type)
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
+#
+# Logging
+#
+# ------------------------------------------------------------------------
+LOG = logging.getLogger('.form')
+
+# ------------------------------------------------------------------------
 #
 # Internationalisation
 #
-#------------------------------------------------------------------------
-from gramps.gen.const import GRAMPS_LOCALE as glocale
+# ------------------------------------------------------------------------
 try:
     _trans = glocale.get_addon_translator(__file__)
 except ValueError:
     _trans = glocale.translation
 _ = _trans.gettext
 
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 #
 # FormActions class
 #
-#------------------------------------------------------------------------
+# ------------------------------------------------------------------------
+
+
 class FormActions(object):
     """
     Form Action selector.
@@ -99,17 +106,20 @@ def __init__(self, dbstate, uistate, track, citation):
 
         self.actions_module = None
         # for security reasons provide the full path to the actions_module .py file
-        full_path = os.path.join(os.path.dirname(__file__), '{form_id}.py'.format(form_id=self.form_id))
+        full_path = os.path.join(os.path.dirname(
+            __file__), '{form_id}.py'.format(form_id=self.form_id))
         if os.path.exists(full_path):
             # temporarily modify sys.path so that any import statements in the module get processed correctly
             sys.path.insert(0, os.path.dirname(__file__))
             try:
-                spec = importlib.util.spec_from_file_location('form.actions.{form_id}'.format(form_id=self.form_id), full_path)
+                spec = importlib.util.spec_from_file_location(
+                    'form.actions.{form_id}'.format(form_id=self.form_id), full_path)
                 self.actions_module = importlib.util.module_from_spec(spec)
                 spec.loader.exec_module(self.actions_module)
             except (ValueError, ImportError, SyntaxError) as err:
                 self.actions_module = None
-                LOG.warning(_("Form plugin error (from '{path}'): {error}").format(path=full_path, error=err))
+                LOG.warning(_("Form plugin error (from '{path}'): {error}").format(
+                    path=full_path, error=err))
             finally:
                 # must make sure we restore sys.path
                 sys.path.pop(0)
@@ -122,8 +132,10 @@ def __init__(self, dbstate, uistate, track, citation):
         width = self._config.get('interface.form-actions-width')
         height = self._config.get('interface.form-actions-height')
         self.top.resize(width, height)
-        horiz_position = self._config.get('interface.form-actions-horiz-position')
-        vert_position = self._config.get('interface.form-actions-vert-position')
+        horiz_position = self._config.get(
+            'interface.form-actions-horiz-position')
+        vert_position = self._config.get(
+            'interface.form-actions-vert-position')
         if horiz_position != -1:
             self.top.move(horiz_position, vert_position)
 
@@ -146,12 +158,15 @@ def _create_dialog(self, title):
         renderer_action_toggle = Gtk.CellRendererToggle()
         renderer_action_toggle.connect('toggled', self.on_action_toggled)
         column1.pack_start(renderer_action_toggle, False)
-        column1.add_attribute(renderer_action_toggle, 'active', self.RUN_ACTION_COL)
-        column1.add_attribute(renderer_action_toggle, 'inconsistent', self.RUN_INCONSISTENT_COL)
+        column1.add_attribute(renderer_action_toggle,
+                              'active', self.RUN_ACTION_COL)
+        column1.add_attribute(renderer_action_toggle,
+                              'inconsistent', self.RUN_INCONSISTENT_COL)
         column1.pack_start(renderer_text, True)
         column1.add_attribute(renderer_text, 'text', self.ACTION_COL)
 
-        column2 = Gtk.TreeViewColumn(_("Detail"), renderer_text, text=self.DETAIL_COL)
+        column2 = Gtk.TreeViewColumn(
+            _("Detail"), renderer_text, text=self.DETAIL_COL)
         self.tree.append_column(column1)
         self.tree.append_column(column2)
 
@@ -187,7 +202,8 @@ def on_action_toggled(self, widget, path):
         self.model[row_iter][self.RUN_ACTION_COL] = not self.model[row_iter][self.RUN_ACTION_COL]
         if parent:
             # update the status of the parent
-            (consistent, value) = FormActions.all_children_consistent(self.model, parent, FormActions.RUN_ACTION_COL)
+            (consistent, value) = FormActions.all_children_consistent(
+                self.model, parent, FormActions.RUN_ACTION_COL)
             self.model[parent][self.RUN_INCONSISTENT_COL] = not consistent
             self.model[parent][self.RUN_ACTION_COL] = consistent and value
 
@@ -211,14 +227,17 @@ def _populate_model(self):
         if self.actions_module:
             # get the all actions that the actions module can provide for the form
             # because the module is dynamically loaded, use getattr to retrieve the actual function to call
-            all_actions = getattr(self.actions_module, 'get_actions')(self.dbstate, self.citation, self.event)
+            all_actions = getattr(self.actions_module, 'get_actions')(
+                self.dbstate, self.citation, self.event)
             for (title, actions) in all_actions:
                 if actions:
                     # add the action category
-                    parent = self.model.append(None, (False, False, title, None, None))
+                    parent = self.model.append(
+                        None, (False, False, title, None, None))
                     for action_detail in actions:
                         # add available actions within this category
-                        self.model.append(parent, (False, False) + action_detail)
+                        self.model.append(
+                            parent, (False, False) + action_detail)
 
     def run(self):
         """
@@ -252,11 +271,13 @@ def run(self):
             for action_type_row in self.model:
                 for action_row in action_type_row.iterchildren():
                     if action_row.model.get_value(action_row.iter, self.RUN_ACTION_COL):
-                        actions.append(action_row.model.get_value(action_row.iter, self.ACTION_COMMAND_COL))
+                        actions.append(action_row.model.get_value(
+                            action_row.iter, self.ACTION_COMMAND_COL))
             # run the actions
             for index, action in enumerate(actions):
                 (action)(self.dbstate, self.uistate, self.track)
-                self.uistate.pulse_progressbar((index + 1) / len(actions) * 100)
+                self.uistate.pulse_progressbar(
+                    (index + 1) / len(actions) * 100)
             self.uistate.progress.hide()
             self.uistate.set_busy_cursor(False)
 
