update eit imports + minor rename in entropy_path_loader

entropy_path_loader/compat/_entropy/__init__.py

@@ -18,3 +18,6 @@ sys.modules['_entropy.solo'] = solo
 
 import magneto
 sys.modules['_entropy.magneto'] = magneto
+
+import eit
+sys.modules['_entropy.eit'] = eit

entropy_path_loader/entropy_path_loader.py

@@ -20,15 +20,15 @@ base_dir = osp.dirname(osp.dirname(osp.realpath(__file__)))
 in_checkout = osp.isfile(osp.join(base_dir, "entropy-in-vcs-checkout"))
 
 
-def add_import_path(mod):
+def add_import_path(path):
     if not in_checkout:
         raise RuntimeError(
             "entropy_path_loader used when not in checkout")
-    lib = osp.join(base_dir, mod)
+    lib = osp.join(base_dir, path)
     sys.path.insert(0, lib)
 
 
-mods = (
+mod_paths = (
     "client",
     "server",
     "lib",
@@ -36,5 +36,5 @@ mods = (
     "entropy_path_loader/compat"
 )
 
-for mod in mods:
-    add_import_path(mod)
+for path in mod_paths:
+    add_import_path(path)

server/doc/generate

@@ -13,7 +13,7 @@ if os.path.isfile(osp.join(_base, "entropy-in-vcs-checkout")):
     import entropy_path_loader
 del osp
 
-from eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
 
 MAN_HEADER="""\
 EIT(1)

server/eit.py

@@ -11,6 +11,6 @@ if os.path.isfile(osp.join(_base, "entropy-in-vcs-checkout")):
     import entropy_path_loader
 del osp
 
-from eit.main import main
+from _entropy.eit.main import main
 sys.argv[0] = "eit"
 main()

server/eit/commands/__init__.py

@@ -21,7 +21,7 @@ for py_file in os.listdir(_cur_dir):
     if py_file.startswith("_"):
         continue
     # strip .py
-    _mod = "eit.commands." + py_file[:-3]
+    _mod = "_entropy.eit.commands." + py_file[:-3]
     if _mod in _excluded_mods:
         continue
     try:

server/eit/commands/add.py

@@ -15,8 +15,8 @@ import argparse
 
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.commit import EitCommit
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.commit import EitCommit
 
 
 class EitAdd(EitCommit):

server/eit/commands/branch.py

@@ -18,8 +18,8 @@ from entropy.output import bold, purple, darkgreen, blue, teal
 
 import entropy.tools
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitBranch(EitCommand):

server/eit/commands/bump.py

@@ -15,8 +15,8 @@ import argparse
 from entropy.output import darkgreen, blue
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitBump(EitCommand):

server/eit/commands/checkout.py

@@ -16,8 +16,8 @@ import argparse
 from entropy.output import darkgreen, blue
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitCheckout(EitCommand):

server/eit/commands/cleanup.py

@@ -16,8 +16,8 @@ import argparse
 from entropy.output import darkgreen, blue, purple
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitCleanup(EitCommand):

server/eit/commands/commit.py

@@ -20,8 +20,8 @@ from entropy.output import darkgreen, teal, brown, \
 
 import entropy.tools
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitCommit(EitCommand):

server/eit/commands/cp.py

@@ -16,8 +16,8 @@ import argparse
 from entropy.output import darkgreen, blue, brown, bold, red, purple, teal
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitCp(EitCommand):

server/eit/commands/deps.py

@@ -16,8 +16,8 @@ from entropy.i18n import _
 from entropy.const import etpConst
 from entropy.output import purple, darkgreen, brown, teal, blue
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitDeps(EitCommand):

server/eit/commands/files.py

@@ -15,8 +15,8 @@ import argparse
 from entropy.i18n import _
 from entropy.output import bold, purple, darkgreen, blue, brown, teal
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitFiles(EitCommand):

server/eit/commands/graph.py

@@ -14,9 +14,9 @@ import argparse
 
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import graph_packages
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import graph_packages
 
 class EitGraph(EitCommand):
     """

server/eit/commands/help.py

@@ -14,9 +14,9 @@ import argparse
 from entropy.i18n import _
 from entropy.output import teal, purple, darkgreen
 
-from eit.colorful import ColorfulFormatter
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.colorful import ColorfulFormatter
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 class EitHelp(EitCommand):
     """

server/eit/commands/init.py

@@ -16,8 +16,8 @@ import argparse
 from entropy.i18n import _
 from entropy.output import darkgreen, teal
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitInit(EitCommand):

server/eit/commands/inject.py

@@ -17,8 +17,8 @@ from entropy.const import const_file_readable
 from entropy.i18n import _
 from entropy.output import teal, purple
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitInject(EitCommand):

server/eit/commands/key.py

@@ -19,8 +19,8 @@ from entropy.i18n import _
 from entropy.security import Repository
 from entropy.tools import convert_unix_time_to_human_time
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitKey(EitCommand):

server/eit/commands/list.py

@@ -17,8 +17,8 @@ from entropy.output import brown, teal, purple, darkgreen
 
 import entropy.dep
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitList(EitCommand):

server/eit/commands/lock.py

@@ -16,8 +16,8 @@ from entropy.i18n import _
 from entropy.output import darkgreen, brown, purple, blue, darkred
 from entropy.transceivers import EntropyTransceiver
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitLock(EitCommand):

server/eit/commands/log.py

@@ -17,8 +17,8 @@ import argparse
 from entropy.const import const_file_readable
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitLog(EitCommand):

server/eit/commands/match.py

@@ -15,9 +15,9 @@ import argparse
 from entropy.i18n import _
 from entropy.output import purple
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import print_package_info
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import print_package_info
 
 
 class EitMatch(EitCommand):

server/eit/commands/merge.py

@@ -15,8 +15,8 @@ import argparse
 
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitMerge(EitCommand):

server/eit/commands/mv.py

@@ -15,8 +15,8 @@ import argparse
 
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.cp import EitCp
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.cp import EitCp
 
 
 class EitMv(EitCp):

server/eit/commands/notice.py

@@ -19,8 +19,8 @@ from entropy.i18n import _
 from entropy.output import blue, darkred, darkgreen, purple, brown, teal
 from entropy.const import const_mkstemp
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitNotice(EitCommand):

server/eit/commands/own.py

@@ -16,9 +16,9 @@ import argparse
 from entropy.i18n import _
 from entropy.output import purple, darkgreen, teal, bold
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import print_package_info
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import print_package_info
 
 
 class EitOwn(EitCommand):

server/eit/commands/pkgmove.py

@@ -19,8 +19,8 @@ from entropy.i18n import _
 from entropy.output import purple, teal
 from entropy.const import const_mkstemp
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitPkgmove(EitCommand):

server/eit/commands/pull.py

@@ -27,9 +27,9 @@ from entropy.client.interfaces.db import InstalledPackagesRepository
 
 import entropy.tools
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.commands.push import EitPush
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.commands.push import EitPush
 
 
 class EitPull(EitCommand):

server/eit/commands/push.py

@@ -27,8 +27,8 @@ from entropy.client.interfaces.db import InstalledPackagesRepository
 
 import entropy.tools
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitPush(EitCommand):

server/eit/commands/query.py

@@ -16,9 +16,9 @@ from entropy.output import purple, darkgreen, bold, brown, teal
 from entropy.const import etpConst
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import print_package_info
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import print_package_info
 
 class EitQuery(EitCommand):
     """

server/eit/commands/remote.py

@@ -22,8 +22,8 @@ from entropy.server.interfaces.main import ServerSystemSettingsPlugin
 
 import entropy.tools
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 class EitRemote(EitCommand):
     """

server/eit/commands/remove.py

@@ -15,8 +15,8 @@ import argparse
 from entropy.i18n import _
 from entropy.output import purple, darkgreen, brown, teal
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitRemove(EitCommand):

server/eit/commands/repack.py

@@ -14,8 +14,8 @@ import argparse
 
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.commit import EitCommit
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.commit import EitCommit
 
 
 class EitRepack(EitCommit):

server/eit/commands/repo.py

@@ -16,9 +16,9 @@ from entropy.i18n import _
 from entropy.output import blue, darkgreen, purple, teal
 from entropy.server.interfaces import RepositoryConfigParser
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import print_table
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import print_table
 
 
 class EitRepo(EitCommand):

server/eit/commands/reset.py

@@ -15,8 +15,8 @@ import argparse
 from entropy.i18n import _
 from entropy.output import darkgreen
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.pull import EitPull
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.pull import EitPull
 
 
 class EitReset(EitPull):

server/eit/commands/revgraph.py

@@ -14,9 +14,9 @@ import argparse
 
 from entropy.i18n import _
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import revgraph_packages
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import revgraph_packages
 
 
 class EitRevgraph(EitCommand):

server/eit/commands/search.py

@@ -15,9 +15,9 @@ import argparse
 from entropy.i18n import _
 from entropy.output import purple
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import print_package_info
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import print_package_info
 
 
 class EitSearch(EitCommand):

server/eit/commands/status.py

@@ -18,9 +18,9 @@ from entropy.i18n import _
 from entropy.output import darkgreen, teal, brown, darkred, \
     bold, purple, blue
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
-from eit.utils import print_table
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
+from _entropy.eit.utils import print_table
 
 
 class EitStatus(EitCommand):

server/eit/commands/test.py

@@ -16,8 +16,8 @@ from entropy.i18n import _
 from entropy.output import teal, purple
 from entropy.server.interfaces import Server
 
-from eit.commands.descriptor import EitCommandDescriptor
-from eit.commands.command import EitCommand
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.command import EitCommand
 
 
 class EitTest(EitCommand):

server/eit/main.py

@@ -19,7 +19,7 @@ from entropy.output import print_error
 import entropy.tools
 
 from entropy.exceptions import OnlineMirrorError
-from eit.commands.descriptor import EitCommandDescriptor
+from _entropy.eit.commands.descriptor import EitCommandDescriptor
 
 
 def handle_exception(exc_class, exc_instance, exc_tb):