From 713cf0e927ea46228b5bb07dc4b938f4829d0987 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] usage magneto imports --- .../compat/_entropy/__init__.py | 16 ++++++++++++++ entropy_path_loader/entropy_path_loader.py | 1 + magneto/src/magneto/core/interfaces.py | 2 +- magneto/src/magneto/gtk/interfaces.py | 6 +++--- magneto/src/magneto/gtk3/interfaces.py | 6 +++--- magneto/src/magneto/qt5/interfaces.py | 6 +++--- magneto/src/magneto_app.py | 21 +++++++++---------- 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/entropy_path_loader/compat/_entropy/__init__.py b/entropy_path_loader/compat/_entropy/__init__.py index 7ff8ac835..90d707d74 100644 --- a/entropy_path_loader/compat/_entropy/__init__.py +++ b/entropy_path_loader/compat/_entropy/__init__.py @@ -1,4 +1,20 @@ +# -*- coding: utf-8 -*- +""" + + @author: Slawomir Nizio + @contact: lxnay@sabayon.org, slawomir.nizio@sabayon.org + @copyright: Slawomir Nizio + @license: GPL-2 + + B{Module to provide _entropy namespace}. + + When installed, internal modules go into B{_entropy}. This provides it for + running from the checkout. +""" import sys import solo sys.modules['_entropy.solo'] = solo + +import magneto +sys.modules['_entropy.magneto'] = magneto diff --git a/entropy_path_loader/entropy_path_loader.py b/entropy_path_loader/entropy_path_loader.py index 798ea6f56..00a7841b1 100644 --- a/entropy_path_loader/entropy_path_loader.py +++ b/entropy_path_loader/entropy_path_loader.py @@ -32,6 +32,7 @@ mods = ( "client", "server", "lib", + "magneto/src", "entropy_path_loader/compat" ) diff --git a/magneto/src/magneto/core/interfaces.py b/magneto/src/magneto/core/interfaces.py index fc12775d4..22a5ed10d 100644 --- a/magneto/src/magneto/core/interfaces.py +++ b/magneto/src/magneto/core/interfaces.py @@ -28,7 +28,7 @@ from entropy.i18n import _, ngettext from entropy.misc import ParallelTask # Magneto imports -from magneto.core import config +from _entropy.magneto.core import config # RigoDaemon imports from RigoDaemon.config import DbusConfig diff --git a/magneto/src/magneto/gtk/interfaces.py b/magneto/src/magneto/gtk/interfaces.py index 28b7b59c9..b3a1ece99 100644 --- a/magneto/src/magneto/gtk/interfaces.py +++ b/magneto/src/magneto/gtk/interfaces.py @@ -20,9 +20,9 @@ import gobject import pynotify # applet imports -from magneto.core import config -from magneto.core.interfaces import MagnetoCore -from magneto.gtk.components import AppletNoticeWindow +from _entropy.magneto.core import config +from _entropy.magneto.core.interfaces import MagnetoCore +from _entropy.magneto.gtk.components import AppletNoticeWindow # Entropy imports from entropy.i18n import _ diff --git a/magneto/src/magneto/gtk3/interfaces.py b/magneto/src/magneto/gtk3/interfaces.py index e07303df7..395c6ce03 100644 --- a/magneto/src/magneto/gtk3/interfaces.py +++ b/magneto/src/magneto/gtk3/interfaces.py @@ -17,9 +17,9 @@ import time import subprocess # applet imports -from magneto.core import config -from magneto.core.interfaces import MagnetoCore -from magneto.gtk3.components import AppletNoticeWindow +from _entropy.magneto.core import config +from _entropy.magneto.core.interfaces import MagnetoCore +from _entropy.magneto.gtk3.components import AppletNoticeWindow # Entropy imports from entropy.i18n import _ diff --git a/magneto/src/magneto/qt5/interfaces.py b/magneto/src/magneto/qt5/interfaces.py index 7998a73ae..9246dbf96 100644 --- a/magneto/src/magneto/qt5/interfaces.py +++ b/magneto/src/magneto/qt5/interfaces.py @@ -19,9 +19,9 @@ from PyQt5.QtWidgets import QApplication, QSystemTrayIcon, QMenu, \ QAction, QDialog # Magneto imports -from magneto.core import config -from magneto.core.interfaces import MagnetoCore -from magneto.qt5.components import AppletNoticeWindow +from _entropy.magneto.core import config +from _entropy.magneto.core.interfaces import MagnetoCore +from _entropy.magneto.qt5.components import AppletNoticeWindow # Entropy imports from entropy.i18n import _ diff --git a/magneto/src/magneto_app.py b/magneto/src/magneto_app.py index 8b60b6d73..ccbc06fb5 100755 --- a/magneto/src/magneto_app.py +++ b/magneto/src/magneto_app.py @@ -22,7 +22,6 @@ 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("rigo") - entropy_path_loader.add_import_path("magneto") del osp from entropy.locks import SimpleFileLock @@ -47,34 +46,34 @@ def _startup(unlock_callback): is_mate = desktop_session == "MATE" if "--kde" in sys.argv: - from magneto.qt5.interfaces import Magneto + from _entropy.magneto.qt5.interfaces import Magneto elif "--gtk" in sys.argv: - from magneto.gtk.interfaces import Magneto + from _entropy.magneto.gtk.interfaces import Magneto elif "--gtk3" in sys.argv: - from magneto.gtk3.interfaces import Magneto + from _entropy.magneto.gtk3.interfaces import Magneto else: if kde_env is not None: # this is KDE! try: - from magneto.qt5.interfaces import Magneto + from _entropy.magneto.qt5.interfaces import Magneto except (ImportError, RuntimeError,): # try GTK3, then GTK try: - from magneto.gtk3.interfaces import Magneto + from _entropy.magneto.gtk3.interfaces import Magneto except ImportError: - from magneto.gtk.interfaces import Magneto + from _entropy.magneto.gtk.interfaces import Magneto elif is_mate: # Load GTK2, fallback to GTK3 try: - from magneto.gtk.interfaces import Magneto + from _entropy.magneto.gtk.interfaces import Magneto except ImportError: - from magneto.gtk3.interfaces import Magneto + from _entropy.magneto.gtk3.interfaces import Magneto else: # load GTK3, fallback to GTK2 try: - from magneto.gtk3.interfaces import Magneto + from _entropy.magneto.gtk3.interfaces import Magneto except ImportError: - from magneto.gtk.interfaces import Magneto + from _entropy.magneto.gtk.interfaces import Magneto import entropy.tools magneto = Magneto()