diff options
Diffstat (limited to 'ipsilon')
| -rwxr-xr-x | ipsilon/idpserver.py | 3 | ||||
| -rwxr-xr-x | ipsilon/util/plugin.py | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ipsilon/idpserver.py b/ipsilon/idpserver.py index beb1a92..9fa370e 100755 --- a/ipsilon/idpserver.py +++ b/ipsilon/idpserver.py @@ -54,7 +54,8 @@ if __name__ == "__main__": conf = {'/': {'tools.staticdir.root': os.getcwd()}, '/ui': {'tools.staticdir.on': True, 'tools.staticdir.dir': 'ui'}} - cherrypy.quickstart(Root('default', template_env), '/', conf) + cherrypy.quickstart(Root('default', template_env), + cherrypy.config['base.mount'], conf) else: cherrypy.config['environment'] = 'embedded' diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py index 045cc75..5a517e4 100755 --- a/ipsilon/util/plugin.py +++ b/ipsilon/util/plugin.py @@ -26,11 +26,7 @@ from ipsilon.util.data import Store class Plugins(object): - def __init__(self, path=None): - if path is None: - self._path = os.getcwd() - else: - self._path = path + def __init__(self): self._providers_tree = None def _load_class(self, tree, class_type, file_name): @@ -83,7 +79,7 @@ class PluginLoader(object): if config is None: config = dict() - p = Plugins(path=cherrypy.config['base.dir']) + p = Plugins() (pathname, dummy) = os.path.split(inspect.getfile(baseobj)) self._plugins = { 'config': config, |