Mercurial Repository: p/roundup/code: roundup/instance.py comparison

comparison roundup/instance.py @ 4588:7017c8dd704c

Small improvements on instance.py by Cheer Xiao. - _load_python split into three functions: _compile, _exec and _execfile, mimicing corresponding builtin functions; also the os.path fiddling is isolated to _exec, the motivation being that lib/ should be available for interfaces.py besides extensions and detectors. - all variables named `vars` are renamed to `env` as "vars" shadows the builtin with the same name.

author	Ralf Schlatterbeck <rsc@runtux.com>
date	Fri, 24 Feb 2012 10:00:09 +0100
parents	a2eb4fb3e6d8
children	7b7cfb4b00eb

comparison

equal deleted inserted replaced

-:a2eb4fb3e6d8
+:7017c8dd704c
 from roundup import configuration, mailgw
 from roundup import hyperdb, backends, actions
 from roundup.cgi import client, templating
 from roundup.cgi import actions as cgi_actions
-class Vars:
-def __init__(self, vars):
-self.__dict__.update(vars)
 class Tracker:
 def __init__(self, tracker_home, optimize=0):
 """New-style tracker instance constructor
 Parameters:
 self.cgi_actions = {}
 self.templating_utils = {}
 self.load_interfaces()
 self.templates = templating.get_templates(self.config["TEMPLATES"], self.config["TEMPLATE_ENGINE"])
 self.backend = backends.get_backend(self.get_backend_name())
+libdir = os.path.join(self.tracker_home, 'lib')
+self.libdir = os.path.isdir(libdir) and libdir or ''
 if self.optimize:
-libdir = os.path.join(self.tracker_home, 'lib')
-if os.path.isdir(libdir):
-sys.path.insert(1, libdir)
 self.templates.precompileTemplates()
 # initialize tracker extensions
 for extension in self.get_extensions('extensions'):
 extension(self)
 # load database schema
-schemafilename = os.path.join(self.tracker_home, 'schema.py')
+self.schema = self._compile('schema.py')
-# Note: can't use built-in open()
-#   because of the global function with the same name
-schemafile = file(schemafilename, 'rt')
-self.schema = compile(schemafile.read(), schemafilename, 'exec')
-schemafile.close()
 # load database detectors
 self.detectors = self.get_extensions('detectors')
 # db_open is set to True after first open()
 self.db_open = 0
-if libdir in sys.path:
-sys.path.remove(libdir)
 def get_backend_name(self):
 f = file(os.path.join(self.config.DATABASE, 'backend_name'))
 name = f.readline().strip()
 f.close()
 # load the database schema
 # we cannot skip this part even if self.optimize is set
 # because the schema has security settings that must be
 # applied to each database instance
 backend = self.backend
-vars = {
+env = {
 'Class': backend.Class,
 'FileClass': backend.FileClass,
 'IssueClass': backend.IssueClass,
 'String': hyperdb.String,
 'Password': hyperdb.Password,
 'Boolean': hyperdb.Boolean,
 'Number': hyperdb.Number,
 'db': backend.Database(self.config, name)
 }
-libdir = os.path.join(self.tracker_home, 'lib')
-if os.path.isdir(libdir):
-sys.path.insert(1, libdir)
 if self.optimize:
 # execute preloaded schema object
-exec(self.schema, vars)
+exec(self.schema, env)
 if callable (self.schema_hook):
-self.schema_hook(**vars)
+self.schema_hook(**env)
 # use preloaded detectors
 detectors = self.detectors
 else:
 # execute the schema file
-self._load_python('schema.py', vars)
+self._execfile('schema.py', env)
 if callable (self.schema_hook):
-self.schema_hook(**vars)
+self.schema_hook(**env)
 # reload extensions and detectors
 for extension in self.get_extensions('extensions'):
 extension(self)
 detectors = self.get_extensions('detectors')
-if libdir in sys.path:
+db = env['db']
-sys.path.remove(libdir)
-db = vars['db']
 # apply the detectors
 for detector in detectors:
 detector(db)
 # if we are running in debug mode
 # or this is the first time the database is opened,
 self.db_open = 1
 return db
 def load_interfaces(self):
 """load interfaces.py (if any), initialize Client and MailGW attrs"""
-vars = {}
+env = {}
 if os.path.isfile(os.path.join(self.tracker_home, 'interfaces.py')):
-self._load_python('interfaces.py', vars)
+self._execfile('interfaces.py', env)
-self.Client = vars.get('Client', client.Client)
+self.Client = env.get('Client', client.Client)
-self.MailGW = vars.get('MailGW', mailgw.MailGW)
+self.MailGW = env.get('MailGW', mailgw.MailGW)
-self.TemplatingUtils = vars.get('TemplatingUtils', templating.TemplatingUtils)
+self.TemplatingUtils = env.get('TemplatingUtils', templating.TemplatingUtils)
 def get_extensions(self, dirname):
 """Load python extensions
 Parameters:
 if os.path.isdir(dirpath):
 sys.path.insert(1, dirpath)
 for name in os.listdir(dirpath):
 if not name.endswith('.py'):
 continue
-vars = {}
+env = {}
-self._load_python(os.path.join(dirname, name), vars)
+self._execfile(os.path.join(dirname, name), env)
-extensions.append(vars['init'])
+extensions.append(env['init'])
 sys.path.remove(dirpath)
 return extensions
 def init(self, adminpw):
 db = self.open('admin')
-self._load_python('initial_data.py', {'db': db, 'adminpw': adminpw,
+self._execfile('initial_data.py', {'db': db, 'adminpw': adminpw,
 'admin_email': self.config['ADMIN_EMAIL']})
 db.commit()
 db.close()
 def exists(self):
 return self.backend.db_exists(self.config)
 def nuke(self):
 self.backend.db_nuke(self.config)
-def _load_python(self, file, vars):
+def _compile(self, fname):
-file = os.path.join(self.tracker_home, file)
+fname = os.path.join(self.tracker_home, fname)
-execfile(file, vars)
+return compile(file(fname).read(), fname, 'exec')
-return vars
+def _exec(self, obj, env):
+if self.libdir:
+sys.path.insert(1, self.libdir)
+exec(obj, env)
+if self.libdir:
+sys.path.remove(self.libdir)
+return env
+def _execfile(self, fname, env):
+self._exec(self._compile(fname), env)
 def registerAction(self, name, action):
 # The logic here is this:
 # * if `action` derives from actions.Action,

Mercurial > p > roundup > code

comparison roundup/instance.py @ 4588:7017c8dd704c