usage magneto imports

entropy_path_loader/compat/_entropy/__init__.py

@@ -1,4 +1,20 @@
+# -*- coding: utf-8 -*-
+"""
+
+    @author: Slawomir Nizio <slawomir.nizio@sabayon.org>
+    @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

entropy_path_loader/entropy_path_loader.py

@@ -32,6 +32,7 @@ mods = (
     "client",
     "server",
     "lib",
+    "magneto/src",
     "entropy_path_loader/compat"
 )
 

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

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 _

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 _

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 _

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()