summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2008-06-27 00:38:48 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2008-07-15 12:28:54 +0200
commitaee874ee1c445dd581a7bbf5183455b7e9e4e86d (patch)
tree599d29d71c8fc5391193b3e4413bde2a2a17a354 /src
parented5ebbdd86c99e896570022720da33c480fee8ec (diff)
downloadnbb-aee874ee1c445dd581a7bbf5183455b7e9e4e86d.tar.gz
nbb-aee874ee1c445dd581a7bbf5183455b7e9e4e86d.tar.xz
nbb-aee874ee1c445dd581a7bbf5183455b7e9e4e86d.zip
Rename newplugins to plugins
Diffstat (limited to 'src')
-rw-r--r--src/Makefile-files2
-rw-r--r--src/nbblib/__init__.py11
-rw-r--r--src/nbblib/bs.py3
-rw-r--r--src/nbblib/commands.py2
-rw-r--r--src/nbblib/main.py3
-rw-r--r--src/nbblib/plugins.py (renamed from src/nbblib/newplugins.py)0
-rw-r--r--src/nbblib/test-plugins.py (renamed from src/nbblib/newplugin-test.py)0
-rw-r--r--src/nbblib/vcs.py3
8 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile-files b/src/Makefile-files
index bd6ea23..6707adc 100644
--- a/src/Makefile-files
+++ b/src/Makefile-files
@@ -9,7 +9,7 @@ nbblib_PYTHON += src/nbblib/__init__.py
nbblib_PYTHON += src/nbblib/bs.py
nbblib_PYTHON += src/nbblib/commands.py
nbblib_PYTHON += src/nbblib/main.py
-nbblib_PYTHON += src/nbblib/newplugins.py
+nbblib_PYTHON += src/nbblib/plugins.py
nbblib_PYTHON += src/nbblib/progutils.py
nbblib_PYTHON += src/nbblib/vcs.py
diff --git a/src/nbblib/__init__.py b/src/nbblib/__init__.py
index 0c1a2c2..5f4a254 100644
--- a/src/nbblib/__init__.py
+++ b/src/nbblib/__init__.py
@@ -1,11 +1,14 @@
import nbblib.bs as bs
import nbblib.commands as commands
-import nbblib.newplugins as newplugins
+import nbblib.plugins as plugins
import nbblib.package as package
-import nbblib.vcs as plugins
+import nbblib.progutils as progutils
+import nbblib.vcs as vcs
from package import PACKAGE_VERSION
-__all__ = ['bs', 'commands', 'newplugins',
- 'package', 'plugins', 'vcs',
+__all__ = ['bs', 'commands',
+ 'package', 'plugins',
+ 'progutils',
+ 'vcs',
'PACKAGE_VERSION']
diff --git a/src/nbblib/bs.py b/src/nbblib/bs.py
index e794037..b5fd865 100644
--- a/src/nbblib/bs.py
+++ b/src/nbblib/bs.py
@@ -7,8 +7,7 @@ import os
import logging
from nbblib import progutils
-
-from nbblib import newplugins as plugins
+from nbblib import plugins
class NotABSSourceTree(plugins.PluginNoMatch):
diff --git a/src/nbblib/commands.py b/src/nbblib/commands.py
index 7c8e068..861b8ba 100644
--- a/src/nbblib/commands.py
+++ b/src/nbblib/commands.py
@@ -4,7 +4,7 @@ import logging
import nbblib.package as package
-import nbblib.newplugins as plugins
+import nbblib.plugins as plugins
import nbblib.progutils as progutils
import nbblib.vcs as vcs
import nbblib.bs as bs
diff --git a/src/nbblib/main.py b/src/nbblib/main.py
index 7d71e89..6e5d6d5 100644
--- a/src/nbblib/main.py
+++ b/src/nbblib/main.py
@@ -124,10 +124,9 @@ import logging
from nbblib import bs
from nbblib import commands
from nbblib import package
+from nbblib import plugins
from nbblib import vcs
-import nbblib.newplugins as plugins
-
def print_version(context):
print "%(prog)s (ndim's branch builder) %(PACKAGE_VERSION)s" % context
diff --git a/src/nbblib/newplugins.py b/src/nbblib/plugins.py
index 1cb41cd..1cb41cd 100644
--- a/src/nbblib/newplugins.py
+++ b/src/nbblib/plugins.py
diff --git a/src/nbblib/newplugin-test.py b/src/nbblib/test-plugins.py
index 8082aec..8082aec 100644
--- a/src/nbblib/newplugin-test.py
+++ b/src/nbblib/test-plugins.py
diff --git a/src/nbblib/vcs.py b/src/nbblib/vcs.py
index c21b81e..8830cf3 100644
--- a/src/nbblib/vcs.py
+++ b/src/nbblib/vcs.py
@@ -4,8 +4,7 @@ import urlparse
from nbblib import package
from nbblib import progutils
-
-from nbblib import newplugins as plugins
+from nbblib import plugins
class AbstractConfig(object):