wip

diff --git a/getmyancestors/__init__.py b/getmyancestors/__init__.py
index 5be33165caa1a2b625362390620522d65c88ce4f..fbcba0c3d0cb53c4660f231207c729e6fbb5dc03 100644 (file)
--- a/getmyancestors/__init__.py
+++ b/getmyancestors/__init__.py
@@ -1,6 +1,3 @@
 # coding: utf-8
 
-from . import getmyancestors
-from . import mergemyancestors
-
 __version__ = "1.1.2"

diff --git a/getmyancestors/__main__.py b/getmyancestors/__main__.py
index 3b766b34f46e287b6ea7c4f58453e34c3c9024a2..c2cc1705b7399eb3756d0060bd55dc9b20692580 100644 (file)
--- a/getmyancestors/__main__.py
+++ b/getmyancestors/__main__.py
@@ -1,3 +1,3 @@
-from getmyancestors import getmyancestors
+from getmyancestors import getmyanc
 
 getmyancestors.main()

diff --git a/getmyancestors/classes/tree.py b/getmyancestors/classes/tree.py
index 1b005f11c0ccf4a92249263ece3927fcf8af24af..0e89c68773e664a8a6181431dbcc5cb2949acb62 100644 (file)
--- a/getmyancestors/classes/tree.py
+++ b/getmyancestors/classes/tree.py
@@ -8,7 +8,7 @@ from urllib.parse import unquote
 import babelfish
 
 # local imports
-import getmyancestors
+from getmyancestors import __version__
 from getmyancestors.classes.constants import (
     MAX_PERSONS,
     FACT_EVEN,
@@ -848,7 +848,7 @@ class Tree:
         file.write("2 VERS 5.5.1\n")
         file.write("2 FORM LINEAGE-LINKED\n")
         file.write("1 SOUR getmyancestors\n")
-        file.write("2 VERS %s\n" % getmyancestors.__version__)
+        file.write("2 VERS %s\n" % __version__)
         file.write("2 NAME getmyancestors\n")
         file.write("1 DATE %s\n" % time.strftime("%d %b %Y"))
         file.write("2 TIME %s\n" % time.strftime("%H:%M:%S"))

diff --git a/getmyancestors/getmyancestors.py b/getmyancestors/getmyanc.py
similarity index 99%
rename from getmyancestors/getmyancestors.py
rename to getmyancestors/getmyanc.py
index fc9e7e5e3ba301663bb67c93382e2861165f51a1..ef03fed6150a4adadefcf7549f5bc821eff48154 100644 (file)
--- a/getmyancestors/getmyancestors.py
+++ b/getmyancestors/getmyanc.py
@@ -5,7 +5,6 @@ from __future__ import print_function
 import re
 import sys
 import time
-from urllib.parse import unquote
 import getpass
 import asyncio
 import argparse
@@ -15,7 +14,6 @@ from getmyancestors.classes.tree import Tree
 from getmyancestors.classes.session import Session
 
 
-
 def main():
     parser = argparse.ArgumentParser(
         description="Retrieve GEDCOM data from FamilySearch Tree (4 Jul 2016)",

diff --git a/getmyancestors/mergemyancestors.py b/getmyancestors/mergemyanc.py
similarity index 100%
rename from getmyancestors/mergemyancestors.py
rename to getmyancestors/mergemyanc.py

diff --git a/requirements.txt b/requirements.txt
index c031354af0ecb04362853a72bb72452eda0d7889..f3451993fc3839e7e816ed328623f88317048e0c 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 babelfish==0.6.1
 diskcache==5.6.3
-requests==2.32.3
-fake-useragent==2.0.3
+requests==2.32.4
+fake-useragent==2.2.0