From 321d59614f20d119972a50fbc2368ad522aa3d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Mon, 26 Nov 2018 20:15:36 +0100 Subject: [PATCH] update eit imports + minor rename in entropy_path_loader --- entropy_path_loader/compat/_entropy/__init__.py | 3 +++ entropy_path_loader/entropy_path_loader.py | 10 +++++----- server/doc/generate | 2 +- server/eit.py | 2 +- server/eit/commands/__init__.py | 2 +- server/eit/commands/add.py | 4 ++-- server/eit/commands/branch.py | 4 ++-- server/eit/commands/bump.py | 4 ++-- server/eit/commands/checkout.py | 4 ++-- server/eit/commands/cleanup.py | 4 ++-- server/eit/commands/commit.py | 4 ++-- server/eit/commands/cp.py | 4 ++-- server/eit/commands/deps.py | 4 ++-- server/eit/commands/files.py | 4 ++-- server/eit/commands/graph.py | 6 +++--- server/eit/commands/help.py | 6 +++--- server/eit/commands/init.py | 4 ++-- server/eit/commands/inject.py | 4 ++-- server/eit/commands/key.py | 4 ++-- server/eit/commands/list.py | 4 ++-- server/eit/commands/lock.py | 4 ++-- server/eit/commands/log.py | 4 ++-- server/eit/commands/match.py | 6 +++--- server/eit/commands/merge.py | 4 ++-- server/eit/commands/mv.py | 4 ++-- server/eit/commands/notice.py | 4 ++-- server/eit/commands/own.py | 6 +++--- server/eit/commands/pkgmove.py | 4 ++-- server/eit/commands/pull.py | 6 +++--- server/eit/commands/push.py | 4 ++-- server/eit/commands/query.py | 6 +++--- server/eit/commands/remote.py | 4 ++-- server/eit/commands/remove.py | 4 ++-- server/eit/commands/repack.py | 4 ++-- server/eit/commands/repo.py | 6 +++--- server/eit/commands/reset.py | 4 ++-- server/eit/commands/revgraph.py | 6 +++--- server/eit/commands/search.py | 6 +++--- server/eit/commands/status.py | 6 +++--- server/eit/commands/test.py | 4 ++-- server/eit/main.py | 2 +- 41 files changed, 92 insertions(+), 89 deletions(-) diff --git a/entropy_path_loader/compat/_entropy/__init__.py b/entropy_path_loader/compat/_entropy/__init__.py index 90d707d74..fccf1327e 100644 --- a/entropy_path_loader/compat/_entropy/__init__.py +++ b/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 diff --git a/entropy_path_loader/entropy_path_loader.py b/entropy_path_loader/entropy_path_loader.py index 00a7841b1..e9a6659b7 100644 --- a/entropy_path_loader/entropy_path_loader.py +++ b/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) diff --git a/server/doc/generate b/server/doc/generate index b2c87cd10..81d883cba 100755 --- a/server/doc/generate +++ b/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) diff --git a/server/eit.py b/server/eit.py index 6324ffea4..907a10685 100755 --- a/server/eit.py +++ b/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() diff --git a/server/eit/commands/__init__.py b/server/eit/commands/__init__.py index 7dd9bdfa1..4cb0f3aa2 100644 --- a/server/eit/commands/__init__.py +++ b/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: diff --git a/server/eit/commands/add.py b/server/eit/commands/add.py index 9929705ee..9061b82a2 100644 --- a/server/eit/commands/add.py +++ b/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): diff --git a/server/eit/commands/branch.py b/server/eit/commands/branch.py index 0e8e35d90..e39a96cfe 100644 --- a/server/eit/commands/branch.py +++ b/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): diff --git a/server/eit/commands/bump.py b/server/eit/commands/bump.py index 1fc1c6fc2..2d503527f 100644 --- a/server/eit/commands/bump.py +++ b/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): diff --git a/server/eit/commands/checkout.py b/server/eit/commands/checkout.py index 5d341ada2..59dfb3c46 100644 --- a/server/eit/commands/checkout.py +++ b/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): diff --git a/server/eit/commands/cleanup.py b/server/eit/commands/cleanup.py index adf041aa4..8b7823764 100644 --- a/server/eit/commands/cleanup.py +++ b/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): diff --git a/server/eit/commands/commit.py b/server/eit/commands/commit.py index e3bb64a79..6cf84513a 100644 --- a/server/eit/commands/commit.py +++ b/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): diff --git a/server/eit/commands/cp.py b/server/eit/commands/cp.py index bad14fe00..704e94248 100644 --- a/server/eit/commands/cp.py +++ b/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): diff --git a/server/eit/commands/deps.py b/server/eit/commands/deps.py index 8cd41ee99..0511154c1 100644 --- a/server/eit/commands/deps.py +++ b/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): diff --git a/server/eit/commands/files.py b/server/eit/commands/files.py index 12b3dd2e5..b23f2a59e 100644 --- a/server/eit/commands/files.py +++ b/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): diff --git a/server/eit/commands/graph.py b/server/eit/commands/graph.py index 02018da66..881783573 100644 --- a/server/eit/commands/graph.py +++ b/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): """ diff --git a/server/eit/commands/help.py b/server/eit/commands/help.py index 46fe5ca1f..95cb899ce 100644 --- a/server/eit/commands/help.py +++ b/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): """ diff --git a/server/eit/commands/init.py b/server/eit/commands/init.py index a3c6a7dc6..58317e65b 100644 --- a/server/eit/commands/init.py +++ b/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): diff --git a/server/eit/commands/inject.py b/server/eit/commands/inject.py index dc53d57ae..a68761b64 100644 --- a/server/eit/commands/inject.py +++ b/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): diff --git a/server/eit/commands/key.py b/server/eit/commands/key.py index c53e805fb..d8a896a1f 100644 --- a/server/eit/commands/key.py +++ b/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): diff --git a/server/eit/commands/list.py b/server/eit/commands/list.py index 465c14baf..5e55835ba 100644 --- a/server/eit/commands/list.py +++ b/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): diff --git a/server/eit/commands/lock.py b/server/eit/commands/lock.py index 8df1b4e7a..7c8bee676 100644 --- a/server/eit/commands/lock.py +++ b/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): diff --git a/server/eit/commands/log.py b/server/eit/commands/log.py index 5d2791cb5..fd73641de 100644 --- a/server/eit/commands/log.py +++ b/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): diff --git a/server/eit/commands/match.py b/server/eit/commands/match.py index f8ea7a1bb..137dbc5cd 100644 --- a/server/eit/commands/match.py +++ b/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): diff --git a/server/eit/commands/merge.py b/server/eit/commands/merge.py index 6f7df6c6a..81eccec5d 100644 --- a/server/eit/commands/merge.py +++ b/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): diff --git a/server/eit/commands/mv.py b/server/eit/commands/mv.py index 25b1c3db2..0a40b6c10 100644 --- a/server/eit/commands/mv.py +++ b/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): diff --git a/server/eit/commands/notice.py b/server/eit/commands/notice.py index 274e99fe2..5b22351f5 100644 --- a/server/eit/commands/notice.py +++ b/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): diff --git a/server/eit/commands/own.py b/server/eit/commands/own.py index b59d6fda2..32ab2ab18 100644 --- a/server/eit/commands/own.py +++ b/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): diff --git a/server/eit/commands/pkgmove.py b/server/eit/commands/pkgmove.py index 8ba442de8..325a5b973 100644 --- a/server/eit/commands/pkgmove.py +++ b/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): diff --git a/server/eit/commands/pull.py b/server/eit/commands/pull.py index 416660fcb..1c612c603 100644 --- a/server/eit/commands/pull.py +++ b/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): diff --git a/server/eit/commands/push.py b/server/eit/commands/push.py index 404163627..d56badccf 100644 --- a/server/eit/commands/push.py +++ b/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): diff --git a/server/eit/commands/query.py b/server/eit/commands/query.py index 2843f717d..1b70682a5 100644 --- a/server/eit/commands/query.py +++ b/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): """ diff --git a/server/eit/commands/remote.py b/server/eit/commands/remote.py index a073852f5..65a3514bc 100644 --- a/server/eit/commands/remote.py +++ b/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): """ diff --git a/server/eit/commands/remove.py b/server/eit/commands/remove.py index d0eb6d3ed..dbebd4567 100644 --- a/server/eit/commands/remove.py +++ b/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): diff --git a/server/eit/commands/repack.py b/server/eit/commands/repack.py index 8173b984e..fcc75adfb 100644 --- a/server/eit/commands/repack.py +++ b/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): diff --git a/server/eit/commands/repo.py b/server/eit/commands/repo.py index c5d42cb27..15428b7ef 100644 --- a/server/eit/commands/repo.py +++ b/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): diff --git a/server/eit/commands/reset.py b/server/eit/commands/reset.py index e4ba1712e..0acc77f69 100644 --- a/server/eit/commands/reset.py +++ b/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): diff --git a/server/eit/commands/revgraph.py b/server/eit/commands/revgraph.py index b82c5cd6e..33ad1e56f 100644 --- a/server/eit/commands/revgraph.py +++ b/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): diff --git a/server/eit/commands/search.py b/server/eit/commands/search.py index 0e2130633..5a9a8b8b7 100644 --- a/server/eit/commands/search.py +++ b/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): diff --git a/server/eit/commands/status.py b/server/eit/commands/status.py index c31837dd6..ecb9be077 100644 --- a/server/eit/commands/status.py +++ b/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): diff --git a/server/eit/commands/test.py b/server/eit/commands/test.py index d4c6b6a90..0cede7668 100644 --- a/server/eit/commands/test.py +++ b/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): diff --git a/server/eit/main.py b/server/eit/main.py index f7268901b..600737c28 100644 --- a/server/eit/main.py +++ b/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):