Skip to content

Commit

Permalink
black linting
Browse files Browse the repository at this point in the history
  • Loading branch information
dsblank committed Oct 13, 2024
1 parent 08869eb commit 99b3d2b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 18 deletions.
1 change: 1 addition & 0 deletions gramps/gen/db/upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def gramps_upgrade_21(self):
# Bump up database version. Separate transaction to save metadata.
self._set_metadata("version", 21)


def gramps_upgrade_20(self):
"""
Placeholder update.
Expand Down
1 change: 1 addition & 0 deletions gramps/gen/display/name.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
def _make_cmp_key(a):
return (len(a[1]), a[1]) # set reverse to True!!


# -------------------------------------------------------------------------
#
# NameDisplayError class
Expand Down
1 change: 1 addition & 0 deletions gramps/gen/lib/serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def from_json(data):
"""
return json.loads(data, object_hook=__object_hook)


def to_dict(obj):
"""
Encode a Gramps object in JSON format.
Expand Down
32 changes: 16 additions & 16 deletions gramps/gui/views/treemodels/peoplemodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ def _get_birth_data(self, data, sort_mode):
local = data[COLUMN_EVENT][index]
# FIXME: is this correct?
b = from_dict(local)
#b = EventRef()
#b.unserialize(local)
# b = EventRef()
# b.unserialize(local)
birth = self.db.get_event_from_handle(b.ref)
if sort_mode:
retval = "%09d" % birth.get_date_object().get_sort_value()
Expand All @@ -274,8 +274,8 @@ def _get_birth_data(self, data, sort_mode):
return ""

for event_ref in data[COLUMN_EVENT]:
#er = EventRef()
#er.unserialize(event_ref)
# er = EventRef()
# er.unserialize(event_ref)
er = from_dict(event_ref)
event = self.db.get_event_from_handle(er.ref)
etype = event.get_type()
Expand Down Expand Up @@ -318,8 +318,8 @@ def _get_death_data(self, data, sort_mode):
try:
local = data[COLUMN_EVENT][index]
ref = from_dict(local)
#ref = EventRef()
#ref.unserialize(local)
# ref = EventRef()
# ref.unserialize(local)
event = self.db.get_event_from_handle(ref.ref)
if sort_mode:
retval = "%09d" % event.get_date_object().get_sort_value()
Expand All @@ -336,8 +336,8 @@ def _get_death_data(self, data, sort_mode):

for event_ref in data[COLUMN_EVENT]:
er = from_dict(event_ref)
#er = EventRef()
#er.unserialize(event_ref)
# er = EventRef()
# er.unserialize(event_ref)
event = self.db.get_event_from_handle(er.ref)
etype = event.get_type()
date_str = get_date(event)
Expand Down Expand Up @@ -367,8 +367,8 @@ def column_birth_place(self, data):
try:
local = data[COLUMN_EVENT][index]
br = from_dict(local)
#br = EventRef()
#br.unserialize(local)
# br = EventRef()
# br.unserialize(local)
event = self.db.get_event_from_handle(br.ref)
if event:
place_title = place_displayer.display_event(self.db, event)
Expand All @@ -383,8 +383,8 @@ def column_birth_place(self, data):

for event_ref in data[COLUMN_EVENT]:
er = from_dict(event_ref)
#er = EventRef()
#er.unserialize(event_ref)
# er = EventRef()
# er.unserialize(event_ref)
event = self.db.get_event_from_handle(er.ref)
etype = event.get_type()
if etype.is_birth_fallback() and er.get_role() == EventRoleType.PRIMARY:
Expand All @@ -408,8 +408,8 @@ def column_death_place(self, data):
try:
local = data[COLUMN_EVENT][index]
dr = from_dict(local)
#dr = EventRef()
#dr.unserialize(local)
# dr = EventRef()
# dr.unserialize(local)
event = self.db.get_event_from_handle(dr.ref)
if event:
place_title = place_displayer.display_event(self.db, event)
Expand All @@ -424,8 +424,8 @@ def column_death_place(self, data):

for event_ref in data[COLUMN_EVENT]:
er = from_dict(event_ref)
#er = EventRef()
#er.unserialize(event_ref)
# er = EventRef()
# er.unserialize(event_ref)
event = self.db.get_event_from_handle(er.ref)
etype = event.get_type()
if etype.is_death_fallback() and er.get_role() == EventRoleType.PRIMARY:
Expand Down
7 changes: 5 additions & 2 deletions gramps/plugins/db/dbapi/dbapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,8 @@ def _iter_raw_place_tree_data(self):
while to_do:
handle = to_do.pop()
self.dbapi.execute(
f"SELECT handle, {self._data_field} FROM place WHERE enclosed_by = ?", [handle]
f"SELECT handle, {self._data_field} FROM place WHERE enclosed_by = ?",
[handle],
)
rows = self.dbapi.fetchall()
for row in rows:
Expand Down Expand Up @@ -1006,7 +1007,9 @@ def _get_gramps_ids(self, obj_key):

def _get_raw_data(self, obj_key, handle):
table = KEY_TO_NAME_MAP[obj_key]
self.dbapi.execute(f"SELECT {self._data_field} FROM {table} WHERE handle = ?", [handle])
self.dbapi.execute(
f"SELECT {self._data_field} FROM {table} WHERE handle = ?", [handle]
)
row = self.dbapi.fetchone()
if row:
return self._data_access.loads(row[0])
Expand Down

0 comments on commit 99b3d2b

Please sign in to comment.