From d39dfae9067e81dc44d0d6752628d899d1f30175 Mon Sep 17 00:00:00 2001 From: Shane <30691680+gamesguru@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:25:36 -0400 Subject: [PATCH] run black and isort --- getmyancestors/__init__.py | 3 +-- getmyancestors/classes/constants.py | 1 + getmyancestors/classes/gedcom.py | 4 ++-- getmyancestors/classes/gui.py | 27 +++++++++++++-------------- getmyancestors/classes/session.py | 2 +- getmyancestors/classes/translation.py | 12 ++++++------ getmyancestors/classes/tree.py | 6 +++--- getmyancestors/fstogedcom.py | 9 ++------- getmyancestors/getmyancestors.py | 14 ++++++++------ getmyancestors/mergemyancestors.py | 6 +++--- 10 files changed, 40 insertions(+), 44 deletions(-) diff --git a/getmyancestors/__init__.py b/getmyancestors/__init__.py index 5be3316..6f90f40 100644 --- a/getmyancestors/__init__.py +++ b/getmyancestors/__init__.py @@ -1,6 +1,5 @@ # coding: utf-8 -from . import getmyancestors -from . import mergemyancestors +from . import getmyancestors, mergemyancestors __version__ = "1.1.2" diff --git a/getmyancestors/classes/constants.py b/getmyancestors/classes/constants.py index 20dab75..a5088f4 100644 --- a/getmyancestors/classes/constants.py +++ b/getmyancestors/classes/constants.py @@ -44,6 +44,7 @@ ORDINANCES_STATUS = { "NotNeeded": "INFANT", } + # mergemyancestors constants and functions def reversed_dict(d): return {val: key for key, val in d.items()} diff --git a/getmyancestors/classes/gedcom.py b/getmyancestors/classes/gedcom.py index 3dbb10d..50c2ce9 100644 --- a/getmyancestors/classes/gedcom.py +++ b/getmyancestors/classes/gedcom.py @@ -1,15 +1,15 @@ # mergemyancestors classes +from getmyancestors.classes.constants import FACT_TYPES, ORDINANCES from getmyancestors.classes.tree import ( - Indi, Fact, Fam, + Indi, Memorie, Name, Note, Ordinance, Source, ) -from getmyancestors.classes.constants import FACT_TYPES, ORDINANCES class Gedcom: diff --git a/getmyancestors/classes/gui.py b/getmyancestors/classes/gui.py index c5382e1..ac67238 100644 --- a/getmyancestors/classes/gui.py +++ b/getmyancestors/classes/gui.py @@ -1,26 +1,19 @@ # fstogedcom classes and functions +import asyncio import os import re -import time -import asyncio import tempfile +import time from threading import Thread +from tkinter import IntVar, Menu, StringVar, TclError, filedialog, messagebox +from tkinter.ttk import Button, Checkbutton, Entry, Frame, Label, Notebook, Treeview + from diskcache import Cache -from tkinter import ( - StringVar, - IntVar, - filedialog, - messagebox, - Menu, - TclError, -) -from tkinter.ttk import Frame, Label, Entry, Button, Checkbutton, Treeview, Notebook - -from getmyancestors.classes.tree import Indi, Fam, Tree from getmyancestors.classes.gedcom import Gedcom from getmyancestors.classes.session import Session from getmyancestors.classes.translation import translations +from getmyancestors.classes.tree import Fam, Indi, Tree tmp_dir = os.path.join(tempfile.gettempdir(), "fstogedcom") cache = Cache(tmp_dir) @@ -258,7 +251,13 @@ class SignIn(Frame): self.save_password = IntVar() self.save_password.set(cache.get("save_password") or 0) - check_save_password = Checkbutton(self, text=_("Save Password"), variable=self.save_password, onvalue=1, offvalue=0) + check_save_password = Checkbutton( + self, + text=_("Save Password"), + variable=self.save_password, + onvalue=1, + offvalue=0, + ) label_username.grid(row=0, column=0, pady=15, padx=(0, 5)) entry_username.grid(row=0, column=1) diff --git a/getmyancestors/classes/session.py b/getmyancestors/classes/session.py index 183d305..122f087 100644 --- a/getmyancestors/classes/session.py +++ b/getmyancestors/classes/session.py @@ -1,8 +1,8 @@ # global imports import sys import time -from urllib.parse import urlparse, parse_qs import webbrowser +from urllib.parse import parse_qs, urlparse import requests from fake_useragent import UserAgent diff --git a/getmyancestors/classes/translation.py b/getmyancestors/classes/translation.py index 06532ba..d125eea 100644 --- a/getmyancestors/classes/translation.py +++ b/getmyancestors/classes/translation.py @@ -118,16 +118,16 @@ translations = { "Cut": {"fr": "Couper"}, "Paste": {"fr": "Coller"}, "Username:": { - "fr": "Nom d'utilisateur :", - "de": "Benutzername:", + "fr": "Nom d'utilisateur :", + "de": "Benutzername:", }, "Password:": { - "fr": "Mot de passe :", - "de": "Passwort:", + "fr": "Mot de passe :", + "de": "Passwort:", }, "Save Password": { - "fr": "Enregistrer le mot de passe", - "de": "Passwort speichern", + "fr": "Enregistrer le mot de passe", + "de": "Passwort speichern", }, "ID already exist": {"fr": "Cet identifiant existe déjà"}, "Invalid FamilySearch ID: ": {"fr": "Identifiant FamilySearch invalide : "}, diff --git a/getmyancestors/classes/tree.py b/getmyancestors/classes/tree.py index 1b005f1..d54aca4 100644 --- a/getmyancestors/classes/tree.py +++ b/getmyancestors/classes/tree.py @@ -1,7 +1,7 @@ -import sys +import asyncio import re +import sys import time -import asyncio from urllib.parse import unquote # global imports @@ -10,9 +10,9 @@ import babelfish # local imports import getmyancestors from getmyancestors.classes.constants import ( - MAX_PERSONS, FACT_EVEN, FACT_TAGS, + MAX_PERSONS, ORDINANCES_STATUS, ) diff --git a/getmyancestors/fstogedcom.py b/getmyancestors/fstogedcom.py index db4faef..251cd30 100644 --- a/getmyancestors/fstogedcom.py +++ b/getmyancestors/fstogedcom.py @@ -4,15 +4,10 @@ # global imports import os import sys -from tkinter import ( - Tk, - PhotoImage, -) +from tkinter import PhotoImage, Tk # local imports -from getmyancestors.classes.gui import ( - FStoGEDCOM, -) +from getmyancestors.classes.gui import FStoGEDCOM def main(): diff --git a/getmyancestors/getmyancestors.py b/getmyancestors/getmyancestors.py index fc9e7e5..aa6e36a 100644 --- a/getmyancestors/getmyancestors.py +++ b/getmyancestors/getmyancestors.py @@ -2,18 +2,18 @@ # global imports from __future__ import print_function + +import argparse +import asyncio +import getpass import re import sys import time from urllib.parse import unquote -import getpass -import asyncio -import argparse +from getmyancestors.classes.session import Session # local imports from getmyancestors.classes.tree import Tree -from getmyancestors.classes.session import Session - def main(): @@ -192,7 +192,9 @@ def main(): # check LDS account if args.get_ordinances: test = fs.get_url( - "/service/tree/tree-data/reservations/person/%s/ordinances" % fs.fid, {}, no_api=True + "/service/tree/tree-data/reservations/person/%s/ordinances" % fs.fid, + {}, + no_api=True, ) if not test or test["status"] != "OK": print("Need an LDS account") diff --git a/getmyancestors/mergemyancestors.py b/getmyancestors/mergemyancestors.py index eb48a33..421bd59 100644 --- a/getmyancestors/mergemyancestors.py +++ b/getmyancestors/mergemyancestors.py @@ -2,14 +2,14 @@ from __future__ import print_function +import argparse # global imports import os import sys -import argparse -# local imports -from getmyancestors.classes.tree import Indi, Fam, Tree from getmyancestors.classes.gedcom import Gedcom +# local imports +from getmyancestors.classes.tree import Fam, Indi, Tree sys.path.append(os.path.dirname(sys.argv[0])) -- 2.52.0