From 974305d697eddb291e729947b36665fb93c5f0b6 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 31 Aug 2011 01:23:00 +0200 Subject: [PATCH] [IMP] moved openerpweb into base.common to be renamed web.commom bzr revid: al@openerp.com-20110830232300-0f4hb3pk3jso0dii --- addons/base/__init__.py | 5 +++++ .../base/common}/__init__.py | 0 {openerpweb => addons/base/common}/ast.py | 0 {openerpweb => addons/base/common}/dates.py | 0 .../base/common}/nonliterals.py | 0 .../base/common}/openerpweb.py | 14 ++++++++---- .../base/common}/tests/__init__.py | 0 .../base/common}/tests/test_model.py | 0 .../base/common}/tests/test_nonliterals.py | 0 .../base/common}/tests/test_session.py | 0 addons/base/controllers/main.py | 8 ++++--- addons/base_calendar/controllers/main.py | 3 ++- addons/base_dashboard/controllers.py | 2 +- addons/base_diagram/controllers/main.py | 2 +- addons/base_gantt/controllers/main.py | 2 +- addons/base_graph/controllers/main.py | 4 ++-- addons/web_chat/controllers/main.py | 2 +- addons/web_mobile/controllers/main.py | 22 +++++++++---------- openerp-web.py | 11 +++++++--- 19 files changed, 47 insertions(+), 28 deletions(-) rename {openerpweb => addons/base/common}/__init__.py (100%) rename {openerpweb => addons/base/common}/ast.py (100%) rename {openerpweb => addons/base/common}/dates.py (100%) rename {openerpweb => addons/base/common}/nonliterals.py (100%) rename {openerpweb => addons/base/common}/openerpweb.py (98%) rename {openerpweb => addons/base/common}/tests/__init__.py (100%) rename {openerpweb => addons/base/common}/tests/test_model.py (100%) rename {openerpweb => addons/base/common}/tests/test_nonliterals.py (100%) rename {openerpweb => addons/base/common}/tests/test_session.py (100%) diff --git a/addons/base/__init__.py b/addons/base/__init__.py index ee5959455ad..343b53d050d 100644 --- a/addons/base/__init__.py +++ b/addons/base/__init__.py @@ -1 +1,6 @@ +import common import controllers + +# TODO +# if we detect that we are imported from the openerp server register common.Root() as a wsgi entry point + diff --git a/openerpweb/__init__.py b/addons/base/common/__init__.py similarity index 100% rename from openerpweb/__init__.py rename to addons/base/common/__init__.py diff --git a/openerpweb/ast.py b/addons/base/common/ast.py similarity index 100% rename from openerpweb/ast.py rename to addons/base/common/ast.py diff --git a/openerpweb/dates.py b/addons/base/common/dates.py similarity index 100% rename from openerpweb/dates.py rename to addons/base/common/dates.py diff --git a/openerpweb/nonliterals.py b/addons/base/common/nonliterals.py similarity index 100% rename from openerpweb/nonliterals.py rename to addons/base/common/nonliterals.py diff --git a/openerpweb/openerpweb.py b/addons/base/common/openerpweb.py similarity index 98% rename from openerpweb/openerpweb.py rename to addons/base/common/openerpweb.py index b2364692203..0e413c64e78 100644 --- a/openerpweb/openerpweb.py +++ b/addons/base/common/openerpweb.py @@ -23,8 +23,10 @@ import logging # Globals #----------------------------------------------------------- -path_root = os.path.dirname(os.path.dirname(os.path.normpath(__file__))) -path_addons = os.path.join(path_root, 'addons') +import __main__ + +path_root = __main__.path_root +path_addons = __main__.path_addons cherrypy_root = None #----------------------------------------------------------- @@ -425,12 +427,16 @@ class Root(object): controllers_path[o._cp_path] = o def default(self, *l, **kw): - #print "default",l,kw + print "default",l,kw # handle static files if len(l) > 2 and l[1] == 'static': # sanitize path p = os.path.normpath(os.path.join(*l)) - return cherrypy.lib.static.serve_file(os.path.join(path_addons, p)) + p2 = os.path.join(path_addons, p) + print "p",p + print "p2",p2 + + return cherrypy.lib.static.serve_file(p2) elif len(l) > 1: for i in range(len(l), 1, -1): ps = "/" + "/".join(l[0:i]) diff --git a/openerpweb/tests/__init__.py b/addons/base/common/tests/__init__.py similarity index 100% rename from openerpweb/tests/__init__.py rename to addons/base/common/tests/__init__.py diff --git a/openerpweb/tests/test_model.py b/addons/base/common/tests/test_model.py similarity index 100% rename from openerpweb/tests/test_model.py rename to addons/base/common/tests/test_model.py diff --git a/openerpweb/tests/test_nonliterals.py b/addons/base/common/tests/test_nonliterals.py similarity index 100% rename from openerpweb/tests/test_nonliterals.py rename to addons/base/common/tests/test_nonliterals.py diff --git a/openerpweb/tests/test_session.py b/addons/base/common/tests/test_session.py similarity index 100% rename from openerpweb/tests/test_session.py rename to addons/base/common/tests/test_session.py diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index c9bd7ddfeab..0d652500a35 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -15,9 +15,11 @@ from cStringIO import StringIO import cherrypy -import openerpweb -import openerpweb.ast -import openerpweb.nonliterals +import base.common as openerpweb +import base.common.ast +import base.common.nonliterals +openerpweb.ast = base.common.ast +openerpweb.nonliterals = base.common.nonliterals from babel.messages.pofile import read_po diff --git a/addons/base_calendar/controllers/main.py b/addons/base_calendar/controllers/main.py index 28c871bf2b4..0211b3e4632 100644 --- a/addons/base_calendar/controllers/main.py +++ b/addons/base_calendar/controllers/main.py @@ -1,5 +1,6 @@ +import base.common as openerpweb + from base.controllers.main import View -import openerpweb class CalendarView(View): _cp_path = "/base_calendar/calendarview" diff --git a/addons/base_dashboard/controllers.py b/addons/base_dashboard/controllers.py index b0f5fbf817e..0c5c0a26859 100644 --- a/addons/base_dashboard/controllers.py +++ b/addons/base_dashboard/controllers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import openerpweb +import base.common as openerpweb WIDGET_CONTENT_PATTERN = """ diff --git a/addons/base_diagram/controllers/main.py b/addons/base_diagram/controllers/main.py index 2f76ead7117..8e258810eca 100644 --- a/addons/base_diagram/controllers/main.py +++ b/addons/base_diagram/controllers/main.py @@ -1,5 +1,5 @@ +import base.common as openerpweb from base.controllers.main import View -import openerpweb class DiagramView(View): _cp_path = "/base_diagram/diagram" diff --git a/addons/base_gantt/controllers/main.py b/addons/base_gantt/controllers/main.py index 0e6754ecb05..56fb2b7e79f 100644 --- a/addons/base_gantt/controllers/main.py +++ b/addons/base_gantt/controllers/main.py @@ -1,4 +1,4 @@ -import openerpweb +import base.common as openerpweb from base.controllers.main import View class GanttView(View): diff --git a/addons/base_graph/controllers/main.py b/addons/base_graph/controllers/main.py index 680b9e030c2..f326faf3854 100644 --- a/addons/base_graph/controllers/main.py +++ b/addons/base_graph/controllers/main.py @@ -1,5 +1,5 @@ from base.controllers.main import View -import openerpweb +import base.common as openerpweb class GraphView(View): _cp_path = "/base_graph/graphview" @@ -8,4 +8,4 @@ class GraphView(View): def load(self, req, model, view_id): fields_view = self.fields_view_get(req, model, view_id, 'graph') all_fields = req.session.model(model).fields_get() - return {'fields_view': fields_view, 'all_fields':all_fields} \ No newline at end of file + return {'fields_view': fields_view, 'all_fields':all_fields} diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py index 5e8d48344f8..5c427812d47 100644 --- a/addons/web_chat/controllers/main.py +++ b/addons/web_chat/controllers/main.py @@ -4,7 +4,7 @@ import cherrypy import simplejson import random -import openerpweb +import base.common as openerpweb #---------------------------------------------------------- # OpenERP Web ajaxim Controllers diff --git a/addons/web_mobile/controllers/main.py b/addons/web_mobile/controllers/main.py index d2ba132d1c2..8fa3e32a775 100644 --- a/addons/web_mobile/controllers/main.py +++ b/addons/web_mobile/controllers/main.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -import glob, os -import pprint - -import simplejson - -import openerpweb -import openerpweb.ast -import openerpweb.nonliterals - -import cherrypy - +#import glob, os +#import pprint +# +#import simplejson +# +#import openerpweb +#import openerpweb.ast +#import openerpweb.nonliterals +# +#import cherrypy +# diff --git a/openerp-web.py b/openerp-web.py index 99305b276a8..fe582575b98 100755 --- a/openerp-web.py +++ b/openerp-web.py @@ -1,7 +1,12 @@ #!/usr/bin/env python -import sys +import os,sys -import openerpweb +path_root = os.path.dirname(os.path.abspath(__file__)) +path_addons = os.path.join(path_root, 'addons') +if path_addons not in sys.path: + sys.path.insert(0, path_addons) + +import base if __name__ == "__main__": - openerpweb.main(sys.argv) + base.common.main(sys.argv)