From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 190EF1389E2 for ; Thu, 4 Dec 2014 20:04:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 055C2E0878; Thu, 4 Dec 2014 20:04:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6243DE0878 for ; Thu, 4 Dec 2014 20:04:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50339340587 for ; Thu, 4 Dec 2014 20:04:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA1E3B939 for ; Thu, 4 Dec 2014 20:04:30 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1417722993.0de38192afe9fc752955c595d1badd2431441269.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/emaint/, pym/portage/sync/, pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/emaint/main.py pym/portage/emaint/module.py pym/portage/emaint/progress.py pym/portage/module.py pym/portage/progress.py pym/portage/sync/__init__.py pym/portage/sync/controller.py X-VCS-Directories: pym/portage/emaint/ pym/portage/sync/ pym/portage/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0de38192afe9fc752955c595d1badd2431441269 X-VCS-Branch: plugin-sync Date: Thu, 4 Dec 2014 20:04:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bb4f1474-9689-4d5c-8d76-1bae5991ddd9 X-Archives-Hash: 9a074559bf8e4e210f602a42686c04f3 Message-ID: <20141204200430.KW8MHUJCycJRuRDoLO2niaSKpii1qUjH14nJcGHVYFA@z> commit: 0de38192afe9fc752955c595d1badd2431441269 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 4 00:13:03 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Dec 4 19:56:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0de38192 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 34531e1..ddf48c8 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