run black and isort

diff --git a/getmyancestors/__init__.py b/getmyancestors/__init__.py
index 5be33165caa1a2b625362390620522d65c88ce4f..6f90f40d979aa05cdbf414161ce8a4130bf97470 100644 (file)
--- 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 20dab7504098b4ffc31cec3e2d383cbd8800a9a3..a5088f445c98f8cb6eecb88f2452f758989bb803 100644 (file)
--- 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 3dbb10d5249ff050809b1826051373f576226463..50c2ce9c770847a0c6019e8be3b5ed71ce3cfc8e 100644 (file)
--- 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 c5382e1f80ad46967a233931a2b053c925276b9b..ac672380340d8531970f34a1944df00b21286c4e 100644 (file)
--- 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 183d3050e21ab1b1e565a887a9f4bf8c8600f507..122f08773594a73b870988b74f8cd161594a79da 100644 (file)
--- 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 06532ba2c61c959a38b0930dfae88a17b6568dab..d125eeaa7abee4c9f3e2f8943ba29ffd494fb4d7 100644 (file)
--- 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 1b005f11c0ccf4a92249263ece3927fcf8af24af..d54aca434b917af954ba29e41fb2121f6d3e974e 100644 (file)
--- 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 db4faef807699eb431f816debf1f1fcbfe140fb2..251cd30375ec7d6a46c1392e166848a04d8486f5 100644 (file)
--- 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 fc9e7e5e3ba301663bb67c93382e2861165f51a1..aa6e36a5f20f9533b448ca19626f9105cd75846b 100644 (file)
--- 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 eb48a3300da07c1dc9fdedc21aa2e30f4f688f76..421bd590cfedffac57fc42dc34ab82e8ce96569b 100644 (file)
--- 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]))