[gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/emaint/, pym/portage/sync/, pym/portage/

[Brian Dolbec]

commit:     2c81e0af27f4e50dfadaffd7d11a91afacf6d216
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  4 00:13:03 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep 30 00:42:26 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2c81e0af

Move module.py and progress.py from emaint to portage namespace

This makes it more centrally available as it is used by more than just the 
emaint module.
moule.py: make path and namepace params mandatory.
They are not as easily predictable.
Clean dead code.

---
 pym/portage/emaint/main.py           | 12 +++++++++---
 pym/portage/{emaint => }/module.py   | 23 +++++------------------
 pym/portage/{emaint => }/progress.py |  0
 pym/portage/sync/__init__.py         |  2 +-
 pym/portage/sync/controller.py       |  2 +-
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/pym/portage/emaint/main.py b/pym/portage/emaint/main.py
index 6292338..fea4832 100644
--- a/pym/portage/emaint/main.py
+++ b/pym/portage/emaint/main.py
@@ -9,8 +9,8 @@ import textwrap
 
 import portage
 from portage import os
-from portage.emaint.module import Modules
-from portage.emaint.progress import ProgressBar
+from portage.module import Modules
+from portage.progress import ProgressBar
 from portage.emaint.defaults import DEFAULT_OPTIONS
 from portage.util._argparse import ArgumentParser
 
@@ -153,7 +153,13 @@ def emaint_main(myargv):
        # files (such as the world file) have sane permissions.
        os.umask(0o22)
 
-       module_controller = Modules(namepath="portage.emaint.modules")
+       module_path = os.path.join(
+               (os.path.dirname(
+               os.path.realpath(__file__))), "modules"
+               )
+       module_controller = Modules(
+               path=module_path,
+               namepath="portage.emaint.modules")
        module_names = module_controller.module_names[:]
        module_names.insert(0, "all")
 

diff --git a/pym/portage/emaint/module.py b/pym/portage/module.py
similarity index 87%
rename from pym/portage/emaint/module.py
rename to pym/portage/module.py
index 07a0cb7..a78bb2e 100644
--- a/pym/portage/emaint/module.py
+++ b/pym/portage/module.py
@@ -74,29 +74,16 @@ class Modules(object):
        """Dynamic modules system for loading and retrieving any of the
        installed emaint modules and/or provided class's
 
-       @param path: Optional path to the "modules" directory or
-                       defaults to the directory of this file + '/modules'
-       @param namepath: Optional python import path to the "modules" directory 
or
-                       defaults to the directory name of this file + '.modules'
+       @param path: Path to the "modules" directory
+       @param namepath: Python import path to the "modules" directory
        """
 
-       def __init__(self, path=None, namepath=None):
-               if path:
-                       self._module_path = path
-               else:
-                       self._module_path = os.path.join((
-                               os.path.dirname(os.path.realpath(__file__))), 
"modules")
-               if namepath:
-                       self._namepath = namepath
-               else:
-                       self._namepath = '.'.join(os.path.dirname(
-                               os.path.realpath(__file__)), "modules")
+       def __init__(self, path, namepath):
+               self._module_path = path
+               self._namepath = namepath
                self._modules = self._get_all_modules()
                self.modules = ProtectedDict(self._modules)
                self.module_names = sorted(self._modules)
-               #self.modules = {}
-               #for mod in self.module_names:
-                       #self.module[mod] = LazyLoad(
 
        def _get_all_modules(self):
                """scans the emaint modules dir for loadable modules

diff --git a/pym/portage/emaint/progress.py b/pym/portage/progress.py
similarity index 100%
rename from pym/portage/emaint/progress.py
rename to pym/portage/progress.py

diff --git a/pym/portage/sync/__init__.py b/pym/portage/sync/__init__.py
index b74c89e..58a1298 100644
--- a/pym/portage/sync/__init__.py
+++ b/pym/portage/sync/__init__.py
@@ -3,7 +3,7 @@
 
 import os
 
-from portage.emaint.module import Modules
+from portage.module import Modules
 from portage.sync.controller import SyncManager
 from portage.sync.config_checks import check_type
 

diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py
index f0d1c05..2b3dbad 100644
--- a/pym/portage/sync/controller.py
+++ b/pym/portage/sync/controller.py
@@ -10,7 +10,7 @@ import pwd
 
 import portage
 from portage import os
-from portage.emaint.progress import ProgressBar
+from portage.progress import ProgressBar
 #from portage.emaint.defaults import DEFAULT_OPTIONS
 #from portage.util._argparse import ArgumentParser
 from portage.util import writemsg_level