Mercurial > p > roundup > code
diff roundup/instance.py @ 604:13719594278b config-0-4-0-branch
I've re-worked the config structure a little so it's simpler
(one less file) and added a unit test so we can be sure it's working.
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Wed, 06 Feb 2002 07:11:13 +0000 |
| parents | bdc2ea127ae9 |
| children |
line wrap: on
line diff
--- a/roundup/instance.py Wed Feb 06 04:29:17 2002 +0000 +++ b/roundup/instance.py Wed Feb 06 07:11:13 2002 +0000 @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: instance.py,v 1.5 2001-11-22 15:46:42 jhermann Exp $ +# $Id: instance.py,v 1.5.2.1 2002-02-06 07:11:12 richard Exp $ __doc__ = ''' Instance handling (open instance). @@ -38,13 +38,26 @@ ''' if not os.path.exists(instance_home): raise ValueError, 'no such directory: "%s"'%instance_home + if self.instances.has_key(instance_home): - return imp.load_package(self.instances[instance_home], + # already loaded + instance = imp.load_package(self.instances[instance_home], instance_home) + return instance + + # not loaded - make a module name for the instance self.number = self.number + 1 modname = '_roundup_instance_%s'%self.number self.instances[instance_home] = modname - return imp.load_package(modname, instance_home) + + # import the instance + instance = imp.load_package(modname, instance_home) + + # load the config + instance.instance_config = config.loadInstanceConfig(instance_home) + + # all done + return instance opener = Opener() open = opener.open @@ -55,6 +68,9 @@ # # $Log: not supported by cvs2svn $ +# Revision 1.5 2001/11/22 15:46:42 jhermann +# Added module docstrings to all modules. +# # Revision 1.4 2001/11/12 22:01:06 richard # Fixed issues with nosy reaction and author copies. #