# HG changeset patch # User Sylvain Thénault # Date 1260873044 -3600 # Node ID 21517d42f2edbce143d58c277a5e8920ce1a6874 # Parent 85bb30fb6d9b14c319f626c60f7f4e2a8c9c76cf load site_cubicweb as a module instead of execing it, avoid reimport pbs diff -r 85bb30fb6d9b -r 21517d42f2ed cwconfig.py --- a/cwconfig.py Mon Dec 14 17:54:45 2009 +0100 +++ b/cwconfig.py Tue Dec 15 11:30:44 2009 +0100 @@ -865,12 +865,12 @@ self.warning('site_erudi.py is deprecated, should be renamed to site_cubicweb.py') def _load_site_cubicweb(self, sitefile): - context = {'__file__': sitefile} - execfile(sitefile, context, context) + from logilab.common.modutils import load_module_from_file + module = load_module_from_file(sitefile) self.info('%s loaded', sitefile) # cube specific options - if context.get('options'): - self.register_options(context['options']) + if getattr(module, 'options', None): + self.register_options(module.options) self.load_defaults() def load_configuration(self):