From 9d4f01972775eb6c601f5a7f55715002df2fecb1 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 27 Aug 2012 20:48:15 -0400 Subject: added better common walk_packages implementation for python 2.4 and 2.5 Conflicts: src/lib/Bcfg2/Client/Tools/__init__.py --- src/lib/Bcfg2/Server/SchemaUpdater/__init__.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'src/lib/Bcfg2/Server/SchemaUpdater/__init__.py') diff --git a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py index 79c144811..e7a3191bc 100644 --- a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py +++ b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py @@ -2,12 +2,11 @@ from django.db import connection, DatabaseError from django.core.exceptions import ImproperlyConfigured import django.core.management import logging -import pkgutil import re import sys import traceback -from Bcfg2.Compat import CmpMixin +from Bcfg2.Compat import CmpMixin, walk_packages from Bcfg2.Server.models import InternalDatabaseVersion from Bcfg2.Server.SchemaUpdater.Routines import UpdaterRoutineException, \ UpdaterRoutine @@ -23,18 +22,6 @@ class SchemaTooOldError(UpdaterError): pass -def _walk_packages(paths): - """Python 2.4 lacks this routine""" - import glob - submodules = [] - for path in paths: - for submodule in glob.glob("%s/*.py" % path): - mod = '.'.join(submodule.split("/")[-1].split('.')[:-1]) - if mod != '__init__': - submodules.append((None, mod, False)) - return submodules - - def _release_to_version(release): """ Build a release base for a version @@ -207,12 +194,7 @@ def update_database(): logger.debug("Verifying database schema") updaters = [] - if hasattr(pkgutil, 'walk_packages'): - submodules = pkgutil.walk_packages(path=Changes.__path__) - else: - #python 2.4 - submodules = _walk_packages(Changes.__path__) - for loader, submodule, ispkg in submodules: + for loader, submodule, ispkg in walk_packages(path=Changes.__path__): if ispkg: continue try: -- cgit v1.2.3-1-g7c22