[FIX] imports to handle conflicts with e.g. web.py in embedded mode
bzr revid: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4
This commit is contained in:
parent
96cbcdcf2f
commit
af8864d571
|
@ -1,7 +1,8 @@
|
||||||
import common
|
|
||||||
import controllers
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from . import common
|
||||||
|
from . import controllers
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
class Options(object):
|
class Options(object):
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import http
|
from . import http
|
||||||
import nonliterals
|
from . import nonliterals
|
||||||
import release
|
from . import release
|
||||||
import session
|
from . import session
|
||||||
import xml2json
|
from . import xml2json
|
||||||
|
|
|
@ -25,9 +25,9 @@ import werkzeug.utils
|
||||||
import werkzeug.wrappers
|
import werkzeug.wrappers
|
||||||
import werkzeug.wsgi
|
import werkzeug.wsgi
|
||||||
|
|
||||||
import nonliterals
|
from . import nonliterals
|
||||||
import session
|
from . import session
|
||||||
import openerplib
|
from . import openerplib
|
||||||
|
|
||||||
__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
|
__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
|
||||||
'WebRequest', 'JsonRequest', 'HttpRequest']
|
'WebRequest', 'JsonRequest', 'HttpRequest']
|
||||||
|
|
|
@ -28,5 +28,5 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from main import *
|
from .main import *
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import logging
|
||||||
import time
|
import time
|
||||||
import openerplib
|
import openerplib
|
||||||
|
|
||||||
import nonliterals
|
from . import nonliterals
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
#----------------------------------------------------------
|
#----------------------------------------------------------
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
import main
|
from . import main
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import web.common.http as openerpweb
|
try:
|
||||||
|
import openerp.addons.web.common.http as openerpweb
|
||||||
|
except ImportError:
|
||||||
|
import web.common.http as openerpweb
|
||||||
|
|
||||||
WIDGET_CONTENT_PATTERN = """<!DOCTYPE html>
|
WIDGET_CONTENT_PATTERN = """<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
import controllers
|
from . import controllers
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
import main
|
from . import main
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
import web.common.http as openerpweb
|
try:
|
||||||
from web.controllers.main import View
|
# embedded
|
||||||
|
import openerp.addons.web.common.http as openerpweb
|
||||||
|
from openerp.addons.web.controllers.main import View
|
||||||
|
except ImportError:
|
||||||
|
# standalone
|
||||||
|
import web.common.http as openerpweb
|
||||||
|
from web.controllers.main import View
|
||||||
|
|
||||||
class DiagramView(View):
|
class DiagramView(View):
|
||||||
_cp_path = "/web_diagram/diagram"
|
_cp_path = "/web_diagram/diagram"
|
||||||
|
|
Loading…
Reference in New Issue