From bc3cf0b74ff033d247a826ba55b608922454548a Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 6 Oct 2012 19:10:53 +0200 Subject: rm files, move postload hook bzr revid: al@openerp.com-20121006171053-qggp1r5263h7v7vd --- addons/web/__init__.py | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'addons/web/__init__.py') diff --git a/addons/web/__init__.py b/addons/web/__init__.py index 621931e9167..c4337b37d2c 100644 --- a/addons/web/__init__.py +++ b/addons/web/__init__.py @@ -1,31 +1,4 @@ -import logging - -from . import common -from . import controllers - -_logger = logging.getLogger(__name__) - -class Options(object): - pass - -def wsgi_postload(): - import openerp - import os - import tempfile - import getpass - _logger.info("embedded mode") - o = Options() - o.dbfilter = openerp.tools.config['dbfilter'] - o.server_wide_modules = openerp.conf.server_wide_modules or ['web'] - try: - username = getpass.getuser() - except Exception: - username = "unknown" - o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username) - o.addons_path = openerp.modules.module.ad_paths - o.serve_static = True - o.backend = 'local' - - app = common.http.Root(o) - openerp.wsgi.register_wsgi_handler(app) +import common +import controllers +wsgi_postload = common.http.wsgi_postload -- cgit v1.2.3 From ae6ff0764b709880c458c54a850594db8eed795a Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 10 Oct 2012 22:37:53 +0200 Subject: web remove common, fix imports bzr revid: al@openerp.com-20121010203753-azrcz3k2kd44ni24 --- addons/web/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/__init__.py') diff --git a/addons/web/__init__.py b/addons/web/__init__.py index c4337b37d2c..3b447ce748d 100644 --- a/addons/web/__init__.py +++ b/addons/web/__init__.py @@ -1,4 +1,4 @@ -import common +import http import controllers -wsgi_postload = common.http.wsgi_postload +wsgi_postload = http.wsgi_postload -- cgit v1.2.3