From 7e23b2f358806cb14b92dc7833ce773738534d41 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Sat, 16 May 2009 11:08:46 -0400 Subject: Refactor __import__'s into a separate utility module. --- src/mailman/core/initialize.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/mailman/core/initialize.py') diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py index 18cb823ee..885174fb0 100644 --- a/src/mailman/core/initialize.py +++ b/src/mailman/core/initialize.py @@ -45,6 +45,7 @@ import mailman.config.config import mailman.core.logging from mailman.interfaces.database import IDatabase +from mailman.utilities.modules import call_name @@ -92,15 +93,11 @@ def initialize_2(debug=False): # Run the pre-hook if there is one. config = mailman.config.config if config.mailman.pre_hook: - package, dot, function = config.mailman.pre_hook.rpartition('.') - __import__(package) - getattr(sys.modules[package], function)() + call_name(config.mailman.pre_hook) # Instantiate the database class, ensure that it's of the right type, and # initialize it. Then stash the object on our configuration object. database_class = config.database['class'] - package, dot, class_name = database_class.rpartition('.') - __import__(package) - database = getattr(sys.modules[package], class_name)() + database = call_name(database_class) verifyObject(IDatabase, database) database.initialize(debug) config.db = database @@ -132,9 +129,7 @@ def initialize_3(): # Run the post-hook if there is one. config = mailman.config.config if config.mailman.post_hook: - package, dot, function = config.mailman.post_hook.rpartition('.') - __import__(package) - getattr(sys.modules[package], function)() + call_name(config.mailman.post_hook) -- cgit v1.2.3-70-g09d2