From 3e74fa847c62cd7372f55bec2aef1a0f2edb4e5e 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 matter imports --- entropy_path_loader/compat/_entropy/__init__.py | 3 +++ entropy_path_loader/entropy_path_loader.py | 1 + matter/matter/binpms/base.py | 2 +- matter/matter/binpms/entropysrv.py | 9 +++++---- matter/matter/builder.py | 4 ++-- matter/matter/main.py | 17 ++++++++--------- matter/matter/output.py | 2 +- matter/matter/spec.py | 2 +- matter/matter_app.py | 3 +-- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/entropy_path_loader/compat/_entropy/__init__.py b/entropy_path_loader/compat/_entropy/__init__.py index fccf1327e..179a15209 100644 --- a/entropy_path_loader/compat/_entropy/__init__.py +++ b/entropy_path_loader/compat/_entropy/__init__.py @@ -21,3 +21,6 @@ sys.modules['_entropy.magneto'] = magneto import eit sys.modules['_entropy.eit'] = eit + +import matter +sys.modules['_entropy.matter'] = matter diff --git a/entropy_path_loader/entropy_path_loader.py b/entropy_path_loader/entropy_path_loader.py index e9a6659b7..429087376 100644 --- a/entropy_path_loader/entropy_path_loader.py +++ b/entropy_path_loader/entropy_path_loader.py @@ -33,6 +33,7 @@ mod_paths = ( "server", "lib", "magneto/src", + "matter", "entropy_path_loader/compat" ) diff --git a/matter/matter/binpms/base.py b/matter/matter/binpms/base.py index b8993249e..5e0444d8d 100644 --- a/matter/matter/binpms/base.py +++ b/matter/matter/binpms/base.py @@ -17,7 +17,7 @@ import os import shutil import subprocess -from matter.output import print_info, print_warning +from _entropy.matter.output import print_info, print_warning class BaseBinaryResourceLock(object): diff --git a/matter/matter/binpms/entropysrv.py b/matter/matter/binpms/entropysrv.py index 5680436b9..847f9001c 100644 --- a/matter/matter/binpms/entropysrv.py +++ b/matter/matter/binpms/entropysrv.py @@ -17,11 +17,12 @@ import subprocess import sys import threading -from matter.binpms.base import BaseBinaryResourceLock, \ +from _entropy.matter.binpms.base import BaseBinaryResourceLock, \ BaseBinaryPMS -from matter.spec import MatterSpec, MatterSpecParser, GenericSpecFunctions -from matter.output import print_info, print_warning, print_error -from matter.utils import print_traceback +from _entropy.matter.spec import MatterSpec, MatterSpecParser, \ + GenericSpecFunctions +from _entropy.matter.output import print_info, print_warning, print_error +from _entropy.matter.utils import print_traceback os.environ["ETP_GETTEXT_DOMAIN"] = "entropy-server" diff --git a/matter/matter/builder.py b/matter/matter/builder.py index 926fc3a7c..cf423879a 100644 --- a/matter/matter/builder.py +++ b/matter/matter/builder.py @@ -19,8 +19,8 @@ import shutil import subprocess import tempfile -from matter.utils import mkstemp, mkdtemp, print_traceback -from matter.output import is_stdout_a_tty, print_info, print_warning, \ +from _entropy.matter.utils import mkstemp, mkdtemp, print_traceback +from _entropy.matter.output import is_stdout_a_tty, print_info, print_warning, \ print_error, getcolor, darkgreen, purple, brown # default mandatory features diff --git a/matter/matter/main.py b/matter/matter/main.py index 900620848..80ef1656b 100644 --- a/matter/matter/main.py +++ b/matter/matter/main.py @@ -17,14 +17,13 @@ import argparse import collections # keep these before PackageBuilder due to the os.environ stuff inside -from matter.binpms.base import BaseBinaryPMS, BaseBinaryResourceLock -from matter.builder import PackageBuilder -from matter.lock import MatterResourceLock -from matter.output import purple, darkgreen, print_info, \ +from _entropy.matter.binpms.base import BaseBinaryPMS, BaseBinaryResourceLock +from _entropy.matter.builder import PackageBuilder +from _entropy.matter.lock import MatterResourceLock +from _entropy.matter.output import purple, darkgreen, print_info, \ print_generic, print_warning, print_error, is_stdout_a_tty, nocolor -from matter.spec import SpecParser, MatterSpec -from matter.utils import print_exception - +from _entropy.matter.spec import SpecParser, MatterSpec +from _entropy.matter.utils import print_exception def install_exception_handler(): sys.excepthook = handle_exception @@ -260,7 +259,7 @@ def main(): nocolor() # Load Binary PMS modules - import matter.binpms as _pms + import _entropy.matter.binpms as _pms pms_dir = os.path.dirname(_pms.__file__) for thing in os.listdir(pms_dir): if thing.startswith("__init__.py"): @@ -274,7 +273,7 @@ def main(): name = os.path.basename(thing) name = name.rstrip(".py") - package = "matter.binpms.%s" % (name,) + package = "_entropy.matter.binpms.%s" % (name,) try: importlib.import_module(package) # they will then register diff --git a/matter/matter/output.py b/matter/matter/output.py index 8482430d7..06f3c9f6e 100644 --- a/matter/matter/output.py +++ b/matter/matter/output.py @@ -17,7 +17,7 @@ import errno import os import sys -from matter.utils import is_python3 +from _entropy.matter.utils import is_python3 stuff = {} diff --git a/matter/matter/spec.py b/matter/matter/spec.py index 4c85ca2fc..5d22219e3 100644 --- a/matter/matter/spec.py +++ b/matter/matter/spec.py @@ -12,7 +12,7 @@ import os import shlex -from matter.utils import convert_to_unicode, get_stringtype +from _entropy.matter.utils import convert_to_unicode, get_stringtype class GenericSpecFunctions(object): diff --git a/matter/matter_app.py b/matter/matter_app.py index a6cd67e30..4b709e3c5 100755 --- a/matter/matter_app.py +++ b/matter/matter_app.py @@ -18,10 +18,9 @@ _base = osp.dirname(osp.dirname(osp.realpath(__file__))) if os.path.isfile(osp.join(_base, "entropy-in-vcs-checkout")): sys.path.insert(0, osp.join(_base, "entropy_path_loader")) import entropy_path_loader - entropy_path_loader.add_import_path("matter") del osp -from matter.main import main +from _entropy.matter.main import main if __name__ == "__main__": sys.argv[0] = "matter"