diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-27 20:48:15 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-27 21:00:37 -0400 |
commit | 9d4f01972775eb6c601f5a7f55715002df2fecb1 (patch) | |
tree | 76d50c71915e19767495301abb34fed42ac3a1a4 /src/lib/Bcfg2/Client/Tools/__init__.py | |
parent | c07cc475cbafec24e747d6907f3bf7257e441934 (diff) | |
download | bcfg2-9d4f01972775eb6c601f5a7f55715002df2fecb1.tar.gz bcfg2-9d4f01972775eb6c601f5a7f55715002df2fecb1.tar.bz2 bcfg2-9d4f01972775eb6c601f5a7f55715002df2fecb1.zip |
added better common walk_packages implementation for python 2.4 and 2.5
Conflicts:
src/lib/Bcfg2/Client/Tools/__init__.py
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/__init__.py')
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index b38eca739..b058ae16c 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -3,25 +3,11 @@ import os import sys import stat import time -import pkgutil from subprocess import Popen, PIPE - import Bcfg2.Client.XML -from Bcfg2.Compat import input - -if hasattr(pkgutil, 'walk_packages'): - submodules = pkgutil.walk_packages(path=__path__) -else: - # python 2.4 - import glob - submodules = [] - for path in __path__: - for submodule in glob.glob(os.path.join(path, "*.py")): - mod = os.path.splitext(os.path.basename(submodule))[0] - if mod not in ['__init__']: - submodules.append((None, mod, True)) - -__all__ = [m[1] for m in submodules] +from Bcfg2.Compat import input, walk_packages + +__all__ = [m[1] for m in walk_packages(path=__path__)] drivers = [item for item in __all__ if item not in ['rpmtools']] default = [item for item in drivers if item not in ['RPM', 'Yum']] |