diff options
| -rw-r--r-- | src/nbblib/__init__.py | 6 | ||||
| -rw-r--r-- | src/nbblib/main.py | 28 | ||||
| -rw-r--r-- | src/nbblib/vcs.py | 22 |
3 files changed, 26 insertions, 30 deletions
diff --git a/src/nbblib/__init__.py b/src/nbblib/__init__.py index 95fe6da..0004cfc 100644 --- a/src/nbblib/__init__.py +++ b/src/nbblib/__init__.py @@ -1,9 +1,3 @@ -#from nbblib.bs import * -#from nbblib.commands import * -#from nbblib.package import * -#from nbblib.plugins import * -#from nbblib.vcs import * - import nbblib.bs as bs import nbblib.commands as commands import nbblib.newplugins as newplugins diff --git a/src/nbblib/main.py b/src/nbblib/main.py index 830e0fd..7d71e89 100644 --- a/src/nbblib/main.py +++ b/src/nbblib/main.py @@ -117,13 +117,14 @@ Global options: """ +import sys import logging -from nbblib.bs import * -from nbblib.commands import * -from nbblib.package import * -from nbblib.vcs import * +from nbblib import bs +from nbblib import commands +from nbblib import package +from nbblib import vcs import nbblib.newplugins as plugins @@ -191,12 +192,12 @@ class ProgProperty(Property): class VCSProperty(Property): def isvalid(self, value): - return (value in VCSourceTree.plugins.keys()) + return (value in vcs.VCSourceTree.plugins.keys()) class BSProperty(Property): def isvalid(self, value): - return (value in BSSourceTree.plugins.keys()) + return (value in bs.BSSourceTree.plugins.keys()) class BoolProperty(Property): @@ -227,14 +228,15 @@ class Context(object): def main(argv): context = Context() - context.PACKAGE_VERSION = PACKAGE_VERSION - context.vcssystems = ", ".join(VCSourceTree.plugins.keys()) - context.buildsystems = ", ".join(BSSourceTree.plugins.keys()) + context.PACKAGE_VERSION = package.PACKAGE_VERSION + context.vcssystems = ", ".join(vcs.VCSourceTree.plugins.keys()) + context.buildsystems = ", ".join(bs.BSSourceTree.plugins.keys()) context.prog = argv[0] if len(argv) < 2: - raise CommandLineError("%(prog)s requires some arguments", - prog=context.prog) + raise commands.CommandLineError(\ + "%(prog)s requires some arguments", + prog=context.prog) i = 1 while i<len(argv): @@ -266,7 +268,7 @@ def main(argv): i = i + 1 cmd = argv[i] cmdargs = argv[i+1:] - nbb = NBB_Command(cmd, cmdargs, context=context) + nbb = commands.NBB_Command(cmd, cmdargs, context=context) def cmdmain(argv): @@ -281,7 +283,7 @@ def cmdmain(argv): logging.shutdown() print e sys.exit(1) - except CommandLineError, e: + except commands.CommandLineError, e: logging.shutdown() print e sys.exit(2) diff --git a/src/nbblib/vcs.py b/src/nbblib/vcs.py index c7ac22e..c21b81e 100644 --- a/src/nbblib/vcs.py +++ b/src/nbblib/vcs.py @@ -2,8 +2,8 @@ import os import logging import urlparse -from nbblib.package import * -from nbblib.progutils import * +from nbblib import package +from nbblib import progutils from nbblib import newplugins as plugins @@ -119,10 +119,10 @@ class GitSourceTree(VCSourceTree): def __init__(self, context, srcdir): super(GitSourceTree, self).__init__(context) os.chdir(srcdir) - if "true" != prog_stdout(["git", "rev-parse", - "--is-inside-work-tree"]): + if "true" != progutils.prog_stdout(["git", "rev-parse", + "--is-inside-work-tree"]): raise self.no_match_exception(srcdir) - reldir = prog_stdout(["git", "rev-parse", "--show-cdup"]) + reldir = progutils.prog_stdout(["git", "rev-parse", "--show-cdup"]) if reldir: os.chdir(reldir) self.__tree_root = os.getcwd() @@ -135,7 +135,7 @@ class GitSourceTree(VCSourceTree): return self.__tree_root def _get_branch_name(self): - bname = prog_stdout(["git", "symbolic-ref", "HEAD"]) + bname = progutils.prog_stdout(["git", "symbolic-ref", "HEAD"]) refs,heads,branch = bname.split('/') assert(refs=='refs' and heads=='heads') return branch @@ -147,12 +147,12 @@ class GitConfig(AbstractConfig): def __init__(self, *args, **kwargs): super(GitConfig, self).__init__(*args, **kwargs) - def _itemname(self, item): return '.'.join((GIT_CONFIG_PREFIX, item, )) + def _itemname(self, item): return '.'.join((package.GIT_CONFIG_PREFIX, item, )) def _myreldir(self, rdir): return os.path.join(self._srcdir, rdir, self._nick) def get_builddir(self): - ret, stdout, stderr = prog_retstd(['git', 'config', self._itemname('builddir')]) + ret, stdout, stderr = progutils.prog_retstd(['git', 'config', self._itemname('builddir')]) assert(stderr == "") if ret == 0 and stdout: return self._myreldir(stdout) @@ -160,13 +160,13 @@ class GitConfig(AbstractConfig): return super(GitConfig, self).get_builddir() def set_builddir(self, value): - ret, stdout, stderr = prog_retstd(['git', 'config', self._itemname('builddir'), value]) + ret, stdout, stderr = progutils.prog_retstd(['git', 'config', self._itemname('builddir'), value]) assert(ret == 0 and stdout == "" and stderr == "") builddir = property(get_builddir, set_builddir) def get_installdir(self): - ret, stdout, stderr = prog_retstd(['git', 'config', self._itemname('installdir')]) + ret, stdout, stderr = progutils.prog_retstd(['git', 'config', self._itemname('installdir')]) assert(stderr == "") if ret == 0 and stdout: return self._myreldir(stdout) @@ -174,7 +174,7 @@ class GitConfig(AbstractConfig): return super(GitConfig, self).get_installdir() def set_installdir(self, value): - ret, stdout, stderr = prog_retstd(['git', 'config', self._itemname('installdir'), value]) + ret, stdout, stderr = progutils.prog_retstd(['git', 'config', self._itemname('installdir'), value]) assert(ret == 0 and stdout == "" and stderr == "") installdir = property(get_installdir, set_installdir) |