gh-8 Реорганизация структуры генераторов

pynames/__init__.py

@@ -1,10 +1,6 @@
 # coding: utf-8
 
-import pynames.elven
-import pynames.mongolian
-import pynames.scandinavian
-import pynames.korean
-import pynames.russian
+from . import generators
 
-from pynames.relations import GENDER, LANGUAGE
-from pynames.utils import get_all_generators
+from .relations import GENDER, LANGUAGE
+from .utils import get_all_generators

pynames/generators/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

pynames/generators/elven.py

@@ -1,6 +1,5 @@
 # coding: utf-8
 
-
 import os
 
 from pynames.from_tables_generator import FromTablesGenerator
@@ -8,7 +7,7 @@ from pynames.from_tables_generator import FromTablesGenerator
 FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixtures')
 
 class WarhammerNamesGenerator(FromTablesGenerator):
-    SOURCE = os.path.join(FIXTURES_DIR, 'warhammer_names_tables.json')
+    SOURCE = os.path.join(FIXTURES_DIR, 'elven_warhammer_names_tables.json')
 
 class DnDNamesGenerator(FromTablesGenerator):
-    SOURCE = os.path.join(FIXTURES_DIR, 'dnd_names_tables.json')
+    SOURCE = os.path.join(FIXTURES_DIR, 'elven_dnd_names_tables.json')

pynames/generators/goblin.py

@@ -3,7 +3,7 @@
 import os
 
 from pynames.from_tables_generator import FromTablesGenerator
-from pynames.iron_kingdoms import GobberFullnameGenerator
+from pynames.generators.iron_kingdoms import GobberFullnameGenerator
 
 FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixtures')
 

pynames/tests/test_utils.py

@@ -30,7 +30,7 @@ class TestName(unittest.TestCase):
             self.assertTrue(is_file(File('mock')))
             self.assertTrue(is_file(ContentFile('mock')))
 
-    def test_file_dapter(self):
+    def test_file_adapter(self):
         root_dir = os.path.dirname(pynames.__file__)
 
         test_file_path = os.path.join(root_dir, 'tests', 'fixtures', 'test_from_list_generator.json')

pynames/utils.py

@@ -2,10 +2,9 @@
 
 import contextlib
 import importlib
+import pkgutil
 import os
 
-import pynames
-
 
 def get_all_generators():
 
@@ -15,19 +14,11 @@ def get_all_generators():
 
     submodules = []
 
-    root_dir = os.path.dirname(pynames.__file__)
+    pynames_root = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'generators')
 
-    for dirname in os.listdir(root_dir):
-        module_path = os.path.join(root_dir, dirname)
-        if not os.path.isdir(module_path):
-            continue
-
-        try:
-            module_name = 'pynames.%s' % dirname
-            module = importlib.import_module(module_name)
-            submodules.append(module)
-        except Exception:
-            continue
+    for _, module_name, _ in pkgutil.iter_modules([pynames_root], prefix='pynames.generators.'):
+        module = importlib.import_module(module_name)
+        submodules.append(module)
 
     generators = []