diff --git a/bin/openerp-server.py b/openerp-server.py similarity index 93% rename from bin/openerp-server.py rename to openerp-server.py index a3f8ed84b34..bf4dc781b55 100755 --- a/bin/openerp-server.py +++ b/openerp-server.py @@ -40,7 +40,7 @@ import sys import threading import traceback -import release +import openerp.release as release __author__ = release.author __version__ = release.version @@ -52,16 +52,19 @@ if os.name == 'posix': sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n") sys.exit(1) -#---------------------------------------------------------- -# get logger -#---------------------------------------------------------- -import netsvc -logger = logging.getLogger('server') - #----------------------------------------------------------------------- # import the tools module so that the commandline parameters are parsed #----------------------------------------------------------------------- -import tools +import openerp.tools as tools +tools.config.parse_config() + +#---------------------------------------------------------- +# get logger +#---------------------------------------------------------- +import openerp.netsvc as netsvc +netsvc.init_logger() +logger = logging.getLogger('server') + logger.info("OpenERP version - %s", release.version) for name, value in [('addons_path', tools.config['addons_path']), ('database hostname', tools.config['db_host'] or 'localhost'), @@ -84,37 +87,37 @@ logger.info('initialising distributed objects services') #--------------------------------------------------------------- # connect to the database and initialize it with base if needed #--------------------------------------------------------------- -import pooler +import openerp.pooler as pooler #---------------------------------------------------------- # import basic modules #---------------------------------------------------------- -import osv -import workflow -import report -import service +import openerp.osv as osv +import openerp.workflow as workflow +import openerp.report as report +import openerp.service as service #---------------------------------------------------------- # import addons #---------------------------------------------------------- -import addons +import openerp.addons as addons #---------------------------------------------------------- # Load and update databases if requested #---------------------------------------------------------- -import service.http_server +import openerp.service.http_server as service_http_server if not ( tools.config["stop_after_init"] or \ tools.config["translate_in"] or \ tools.config["translate_out"] ): - service.http_server.init_servers() - service.http_server.init_xmlrpc() - service.http_server.init_static_http() + service_http_server.init_servers() + service_http_server.init_xmlrpc() + service_http_server.init_static_http() - import service.netrpc_server - service.netrpc_server.init_servers() + import openerp.service.netrpc_server as service_netrpc_server + service_netrpc_server.init_servers() if tools.config['db_name']: for dbname in tools.config['db_name'].split(','): diff --git a/bin/PKG-INFO b/openerp/PKG-INFO similarity index 100% rename from bin/PKG-INFO rename to openerp/PKG-INFO diff --git a/bin/__init__.py b/openerp/__init__.py similarity index 72% rename from bin/__init__.py rename to openerp/__init__.py index e2c8cd49cc2..43230ef2dfa 100644 --- a/bin/__init__.py +++ b/openerp/__init__.py @@ -19,6 +19,28 @@ # ############################################################################## +# We don't want addons to be imported right now; +# the commented imports import addons. +# This will change when addons.__init__ and addons.base +# are cleaned. + +#import addons +import ir +import loglevels +import netsvc +import osv +#import pooler +import pychart +import release +#import report +import run_tests +#import service +import sql_db +import test +import tiny_socket +#import tools +import wizard +import workflow # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bin/addons/__init__.py b/openerp/addons/__init__.py similarity index 98% rename from bin/addons/__init__.py rename to openerp/addons/__init__.py index 94d6a0dfdf6..fa71f7ffbee 100644 --- a/bin/addons/__init__.py +++ b/openerp/addons/__init__.py @@ -25,17 +25,17 @@ from os.path import join as opj import itertools import zipimport -import osv -import tools -import tools.osutil -from tools.safe_eval import safe_eval as eval -import pooler -from tools.translate import _ +import openerp.osv as osv +import openerp.tools as tools +import openerp.tools.osutil as osutil +from openerp.tools.safe_eval import safe_eval as eval +import openerp.pooler as pooler +from openerp.tools.translate import _ -import netsvc +import openerp.netsvc as netsvc import zipfile -import release +import openerp.release as release import re import base64 @@ -44,7 +44,6 @@ from cStringIO import StringIO import logging - logger = netsvc.Logger() _ad = os.path.abspath(opj(tools.ustr(tools.config['root_path']), u'addons')) # default addons path (base) @@ -186,7 +185,7 @@ def get_module_filetree(module, dir='.'): zip = zipfile.ZipFile(path + ".zip") files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()] else: - files = tools.osutil.listdir(path, True) + files = osutil.listdir(path, True) tree = {} for f in files: @@ -218,7 +217,7 @@ def zip_directory(directory, b64enc=True, src=True): def _zippy(archive, path, src=True): path = os.path.abspath(path) base = os.path.basename(path) - for f in tools.osutil.listdir(path, True): + for f in osutil.listdir(path, True): bf = os.path.basename(f) if not RE_exclude.search(bf) and (src or bf in ('__openerp__.py', '__terp__.py') or not bf.endswith('.py')): archive.write(os.path.join(path, f), os.path.join(base, f)) @@ -559,7 +558,7 @@ class MigrationManager(object): a.update(b) return a - from tools.parse_version import parse_version + from openerp.tools.parse_version import parse_version parsed_installed_version = parse_version(pkg.installed_version or '') current_version = parse_version(convert_version(pkg.data.get('version', '0'))) @@ -798,6 +797,12 @@ def _check_module_names(cr, module_names): logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names)) def load_modules(db, force_demo=False, status=None, update_module=False): + + # Backward compatibility: addons don't have to import openerp.xxx, they still can import xxx + for k, v in list(sys.modules.items()): + if k.startswith('openerp.') and sys.modules.get(k[8:]) is None: + sys.modules[k[8:]] = v + if not status: status = {} cr = db.cursor() diff --git a/bin/addons/base/__init__.py b/openerp/addons/base/__init__.py similarity index 100% rename from bin/addons/base/__init__.py rename to openerp/addons/base/__init__.py diff --git a/bin/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py similarity index 100% rename from bin/addons/base/__openerp__.py rename to openerp/addons/base/__openerp__.py diff --git a/bin/addons/base/base.sql b/openerp/addons/base/base.sql similarity index 100% rename from bin/addons/base/base.sql rename to openerp/addons/base/base.sql diff --git a/bin/addons/base/base_data.xml b/openerp/addons/base/base_data.xml similarity index 100% rename from bin/addons/base/base_data.xml rename to openerp/addons/base/base_data.xml diff --git a/bin/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml similarity index 100% rename from bin/addons/base/base_demo.xml rename to openerp/addons/base/base_demo.xml diff --git a/bin/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml similarity index 100% rename from bin/addons/base/base_menu.xml rename to openerp/addons/base/base_menu.xml diff --git a/bin/addons/base/base_update.xml b/openerp/addons/base/base_update.xml similarity index 100% rename from bin/addons/base/base_update.xml rename to openerp/addons/base/base_update.xml diff --git a/bin/addons/base/data/administration-hover.png b/openerp/addons/base/data/administration-hover.png similarity index 100% rename from bin/addons/base/data/administration-hover.png rename to openerp/addons/base/data/administration-hover.png diff --git a/bin/addons/base/data/administration.png b/openerp/addons/base/data/administration.png similarity index 100% rename from bin/addons/base/data/administration.png rename to openerp/addons/base/data/administration.png diff --git a/bin/addons/base/data/res.country.state.csv b/openerp/addons/base/data/res.country.state.csv similarity index 100% rename from bin/addons/base/data/res.country.state.csv rename to openerp/addons/base/data/res.country.state.csv diff --git a/bin/addons/base/data/sales-hover.png b/openerp/addons/base/data/sales-hover.png similarity index 100% rename from bin/addons/base/data/sales-hover.png rename to openerp/addons/base/data/sales-hover.png diff --git a/bin/addons/base/data/sales.png b/openerp/addons/base/data/sales.png similarity index 100% rename from bin/addons/base/data/sales.png rename to openerp/addons/base/data/sales.png diff --git a/bin/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po similarity index 100% rename from bin/addons/base/i18n/af.po rename to openerp/addons/base/i18n/af.po diff --git a/bin/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po similarity index 100% rename from bin/addons/base/i18n/am.po rename to openerp/addons/base/i18n/am.po diff --git a/bin/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po similarity index 100% rename from bin/addons/base/i18n/ar.po rename to openerp/addons/base/i18n/ar.po diff --git a/bin/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot similarity index 100% rename from bin/addons/base/i18n/base.pot rename to openerp/addons/base/i18n/base.pot diff --git a/bin/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po similarity index 100% rename from bin/addons/base/i18n/bg.po rename to openerp/addons/base/i18n/bg.po diff --git a/bin/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po similarity index 100% rename from bin/addons/base/i18n/bs.po rename to openerp/addons/base/i18n/bs.po diff --git a/bin/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po similarity index 100% rename from bin/addons/base/i18n/ca.po rename to openerp/addons/base/i18n/ca.po diff --git a/bin/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po similarity index 100% rename from bin/addons/base/i18n/cs.po rename to openerp/addons/base/i18n/cs.po diff --git a/bin/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po similarity index 100% rename from bin/addons/base/i18n/da.po rename to openerp/addons/base/i18n/da.po diff --git a/bin/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po similarity index 100% rename from bin/addons/base/i18n/de.po rename to openerp/addons/base/i18n/de.po diff --git a/bin/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po similarity index 100% rename from bin/addons/base/i18n/el.po rename to openerp/addons/base/i18n/el.po diff --git a/bin/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po similarity index 100% rename from bin/addons/base/i18n/en_GB.po rename to openerp/addons/base/i18n/en_GB.po diff --git a/bin/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po similarity index 100% rename from bin/addons/base/i18n/es.po rename to openerp/addons/base/i18n/es.po diff --git a/bin/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po similarity index 100% rename from bin/addons/base/i18n/es_AR.po rename to openerp/addons/base/i18n/es_AR.po diff --git a/bin/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po similarity index 100% rename from bin/addons/base/i18n/es_CL.po rename to openerp/addons/base/i18n/es_CL.po diff --git a/bin/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po similarity index 100% rename from bin/addons/base/i18n/es_EC.po rename to openerp/addons/base/i18n/es_EC.po diff --git a/bin/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po similarity index 100% rename from bin/addons/base/i18n/et.po rename to openerp/addons/base/i18n/et.po diff --git a/bin/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po similarity index 100% rename from bin/addons/base/i18n/eu.po rename to openerp/addons/base/i18n/eu.po diff --git a/bin/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po similarity index 100% rename from bin/addons/base/i18n/fa.po rename to openerp/addons/base/i18n/fa.po diff --git a/bin/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po similarity index 100% rename from bin/addons/base/i18n/fi.po rename to openerp/addons/base/i18n/fi.po diff --git a/bin/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po similarity index 100% rename from bin/addons/base/i18n/fr.po rename to openerp/addons/base/i18n/fr.po diff --git a/bin/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po similarity index 100% rename from bin/addons/base/i18n/gl.po rename to openerp/addons/base/i18n/gl.po diff --git a/bin/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po similarity index 100% rename from bin/addons/base/i18n/he.po rename to openerp/addons/base/i18n/he.po diff --git a/bin/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po similarity index 100% rename from bin/addons/base/i18n/hr.po rename to openerp/addons/base/i18n/hr.po diff --git a/bin/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po similarity index 100% rename from bin/addons/base/i18n/hu.po rename to openerp/addons/base/i18n/hu.po diff --git a/bin/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po similarity index 100% rename from bin/addons/base/i18n/id.po rename to openerp/addons/base/i18n/id.po diff --git a/bin/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po similarity index 100% rename from bin/addons/base/i18n/is.po rename to openerp/addons/base/i18n/is.po diff --git a/bin/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po similarity index 100% rename from bin/addons/base/i18n/it.po rename to openerp/addons/base/i18n/it.po diff --git a/bin/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po similarity index 100% rename from bin/addons/base/i18n/ja.po rename to openerp/addons/base/i18n/ja.po diff --git a/bin/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po similarity index 100% rename from bin/addons/base/i18n/ko.po rename to openerp/addons/base/i18n/ko.po diff --git a/bin/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po similarity index 100% rename from bin/addons/base/i18n/lt.po rename to openerp/addons/base/i18n/lt.po diff --git a/bin/addons/base/i18n/lt_LT.po b/openerp/addons/base/i18n/lt_LT.po similarity index 100% rename from bin/addons/base/i18n/lt_LT.po rename to openerp/addons/base/i18n/lt_LT.po diff --git a/bin/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po similarity index 100% rename from bin/addons/base/i18n/lv.po rename to openerp/addons/base/i18n/lv.po diff --git a/bin/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po similarity index 100% rename from bin/addons/base/i18n/mn.po rename to openerp/addons/base/i18n/mn.po diff --git a/bin/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po similarity index 100% rename from bin/addons/base/i18n/nb.po rename to openerp/addons/base/i18n/nb.po diff --git a/bin/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po similarity index 100% rename from bin/addons/base/i18n/nl.po rename to openerp/addons/base/i18n/nl.po diff --git a/bin/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po similarity index 100% rename from bin/addons/base/i18n/nl_BE.po rename to openerp/addons/base/i18n/nl_BE.po diff --git a/bin/addons/base/i18n/nl_NL.po b/openerp/addons/base/i18n/nl_NL.po similarity index 100% rename from bin/addons/base/i18n/nl_NL.po rename to openerp/addons/base/i18n/nl_NL.po diff --git a/bin/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po similarity index 100% rename from bin/addons/base/i18n/pl.po rename to openerp/addons/base/i18n/pl.po diff --git a/bin/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po similarity index 100% rename from bin/addons/base/i18n/pt.po rename to openerp/addons/base/i18n/pt.po diff --git a/bin/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po similarity index 100% rename from bin/addons/base/i18n/pt_BR.po rename to openerp/addons/base/i18n/pt_BR.po diff --git a/bin/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po similarity index 100% rename from bin/addons/base/i18n/ro.po rename to openerp/addons/base/i18n/ro.po diff --git a/bin/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po similarity index 100% rename from bin/addons/base/i18n/ru.po rename to openerp/addons/base/i18n/ru.po diff --git a/bin/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po similarity index 100% rename from bin/addons/base/i18n/sk.po rename to openerp/addons/base/i18n/sk.po diff --git a/bin/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po similarity index 100% rename from bin/addons/base/i18n/sl.po rename to openerp/addons/base/i18n/sl.po diff --git a/bin/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po similarity index 100% rename from bin/addons/base/i18n/sq.po rename to openerp/addons/base/i18n/sq.po diff --git a/bin/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po similarity index 100% rename from bin/addons/base/i18n/sr.po rename to openerp/addons/base/i18n/sr.po diff --git a/bin/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po similarity index 100% rename from bin/addons/base/i18n/sr@latin.po rename to openerp/addons/base/i18n/sr@latin.po diff --git a/bin/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po similarity index 100% rename from bin/addons/base/i18n/sv.po rename to openerp/addons/base/i18n/sv.po diff --git a/bin/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po similarity index 100% rename from bin/addons/base/i18n/th.po rename to openerp/addons/base/i18n/th.po diff --git a/bin/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po similarity index 100% rename from bin/addons/base/i18n/tlh.po rename to openerp/addons/base/i18n/tlh.po diff --git a/bin/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po similarity index 100% rename from bin/addons/base/i18n/tr.po rename to openerp/addons/base/i18n/tr.po diff --git a/bin/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po similarity index 100% rename from bin/addons/base/i18n/uk.po rename to openerp/addons/base/i18n/uk.po diff --git a/bin/addons/base/i18n/uk_UA.po b/openerp/addons/base/i18n/uk_UA.po similarity index 100% rename from bin/addons/base/i18n/uk_UA.po rename to openerp/addons/base/i18n/uk_UA.po diff --git a/bin/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po similarity index 100% rename from bin/addons/base/i18n/ur.po rename to openerp/addons/base/i18n/ur.po diff --git a/bin/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po similarity index 100% rename from bin/addons/base/i18n/vi.po rename to openerp/addons/base/i18n/vi.po diff --git a/bin/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po similarity index 100% rename from bin/addons/base/i18n/zh_CN.po rename to openerp/addons/base/i18n/zh_CN.po diff --git a/bin/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po similarity index 100% rename from bin/addons/base/i18n/zh_TW.po rename to openerp/addons/base/i18n/zh_TW.po diff --git a/bin/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py similarity index 100% rename from bin/addons/base/ir/__init__.py rename to openerp/addons/base/ir/__init__.py diff --git a/bin/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml similarity index 100% rename from bin/addons/base/ir/ir.xml rename to openerp/addons/base/ir/ir.xml diff --git a/bin/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py similarity index 100% rename from bin/addons/base/ir/ir_actions.py rename to openerp/addons/base/ir/ir_actions.py diff --git a/bin/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py similarity index 100% rename from bin/addons/base/ir/ir_attachment.py rename to openerp/addons/base/ir/ir_attachment.py diff --git a/bin/addons/base/ir/ir_board.py b/openerp/addons/base/ir/ir_board.py similarity index 100% rename from bin/addons/base/ir/ir_board.py rename to openerp/addons/base/ir/ir_board.py diff --git a/bin/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py similarity index 100% rename from bin/addons/base/ir/ir_config_parameter.py rename to openerp/addons/base/ir/ir_config_parameter.py diff --git a/bin/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py similarity index 100% rename from bin/addons/base/ir/ir_cron.py rename to openerp/addons/base/ir/ir_cron.py diff --git a/bin/addons/base/ir/ir_default.py b/openerp/addons/base/ir/ir_default.py similarity index 100% rename from bin/addons/base/ir/ir_default.py rename to openerp/addons/base/ir/ir_default.py diff --git a/bin/addons/base/ir/ir_exports.py b/openerp/addons/base/ir/ir_exports.py similarity index 100% rename from bin/addons/base/ir/ir_exports.py rename to openerp/addons/base/ir/ir_exports.py diff --git a/bin/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py similarity index 100% rename from bin/addons/base/ir/ir_filters.py rename to openerp/addons/base/ir/ir_filters.py diff --git a/bin/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py similarity index 100% rename from bin/addons/base/ir/ir_model.py rename to openerp/addons/base/ir/ir_model.py diff --git a/bin/addons/base/ir/ir_rule.py b/openerp/addons/base/ir/ir_rule.py similarity index 100% rename from bin/addons/base/ir/ir_rule.py rename to openerp/addons/base/ir/ir_rule.py diff --git a/bin/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py similarity index 100% rename from bin/addons/base/ir/ir_sequence.py rename to openerp/addons/base/ir/ir_sequence.py diff --git a/bin/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py similarity index 100% rename from bin/addons/base/ir/ir_translation.py rename to openerp/addons/base/ir/ir_translation.py diff --git a/bin/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py similarity index 100% rename from bin/addons/base/ir/ir_ui_menu.py rename to openerp/addons/base/ir/ir_ui_menu.py diff --git a/bin/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py similarity index 100% rename from bin/addons/base/ir/ir_ui_view.py rename to openerp/addons/base/ir/ir_ui_view.py diff --git a/bin/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py similarity index 100% rename from bin/addons/base/ir/ir_values.py rename to openerp/addons/base/ir/ir_values.py diff --git a/bin/addons/base/ir/osv_memory_autovacuum.py b/openerp/addons/base/ir/osv_memory_autovacuum.py similarity index 100% rename from bin/addons/base/ir/osv_memory_autovacuum.py rename to openerp/addons/base/ir/osv_memory_autovacuum.py diff --git a/bin/addons/base/ir/report/ir_report.xml b/openerp/addons/base/ir/report/ir_report.xml similarity index 100% rename from bin/addons/base/ir/report/ir_report.xml rename to openerp/addons/base/ir/report/ir_report.xml diff --git a/bin/addons/base/ir/report/modeloverview.sxw b/openerp/addons/base/ir/report/modeloverview.sxw similarity index 100% rename from bin/addons/base/ir/report/modeloverview.sxw rename to openerp/addons/base/ir/report/modeloverview.sxw diff --git a/bin/addons/base/ir/wizard/__init__.py b/openerp/addons/base/ir/wizard/__init__.py similarity index 100% rename from bin/addons/base/ir/wizard/__init__.py rename to openerp/addons/base/ir/wizard/__init__.py diff --git a/bin/addons/base/ir/wizard/create_action.py b/openerp/addons/base/ir/wizard/create_action.py similarity index 100% rename from bin/addons/base/ir/wizard/create_action.py rename to openerp/addons/base/ir/wizard/create_action.py diff --git a/bin/addons/base/ir/wizard/wizard_menu.py b/openerp/addons/base/ir/wizard/wizard_menu.py similarity index 100% rename from bin/addons/base/ir/wizard/wizard_menu.py rename to openerp/addons/base/ir/wizard/wizard_menu.py diff --git a/bin/addons/base/ir/wizard/wizard_menu_view.xml b/openerp/addons/base/ir/wizard/wizard_menu_view.xml similarity index 100% rename from bin/addons/base/ir/wizard/wizard_menu_view.xml rename to openerp/addons/base/ir/wizard/wizard_menu_view.xml diff --git a/bin/addons/base/ir/wizard/wizard_screen.py b/openerp/addons/base/ir/wizard/wizard_screen.py similarity index 100% rename from bin/addons/base/ir/wizard/wizard_screen.py rename to openerp/addons/base/ir/wizard/wizard_screen.py diff --git a/bin/addons/base/ir/workflow/__init__.py b/openerp/addons/base/ir/workflow/__init__.py similarity index 100% rename from bin/addons/base/ir/workflow/__init__.py rename to openerp/addons/base/ir/workflow/__init__.py diff --git a/bin/addons/base/ir/workflow/print_instance.py b/openerp/addons/base/ir/workflow/print_instance.py similarity index 100% rename from bin/addons/base/ir/workflow/print_instance.py rename to openerp/addons/base/ir/workflow/print_instance.py diff --git a/bin/addons/base/ir/workflow/workflow.py b/openerp/addons/base/ir/workflow/workflow.py similarity index 100% rename from bin/addons/base/ir/workflow/workflow.py rename to openerp/addons/base/ir/workflow/workflow.py diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml similarity index 100% rename from bin/addons/base/ir/workflow/workflow_view.xml rename to openerp/addons/base/ir/workflow/workflow_view.xml diff --git a/bin/addons/base/module/__init__.py b/openerp/addons/base/module/__init__.py similarity index 100% rename from bin/addons/base/module/__init__.py rename to openerp/addons/base/module/__init__.py diff --git a/bin/addons/base/module/module.py b/openerp/addons/base/module/module.py similarity index 100% rename from bin/addons/base/module/module.py rename to openerp/addons/base/module/module.py diff --git a/bin/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml similarity index 100% rename from bin/addons/base/module/module_data.xml rename to openerp/addons/base/module/module_data.xml diff --git a/bin/addons/base/module/module_report.xml b/openerp/addons/base/module/module_report.xml similarity index 100% rename from bin/addons/base/module/module_report.xml rename to openerp/addons/base/module/module_report.xml diff --git a/bin/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml similarity index 100% rename from bin/addons/base/module/module_view.xml rename to openerp/addons/base/module/module_view.xml diff --git a/bin/addons/base/module/report/__init__.py b/openerp/addons/base/module/report/__init__.py similarity index 100% rename from bin/addons/base/module/report/__init__.py rename to openerp/addons/base/module/report/__init__.py diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/openerp/addons/base/module/report/ir_module_reference.rml similarity index 100% rename from bin/addons/base/module/report/ir_module_reference.rml rename to openerp/addons/base/module/report/ir_module_reference.rml diff --git a/bin/addons/base/module/report/ir_module_reference.sxw b/openerp/addons/base/module/report/ir_module_reference.sxw similarity index 100% rename from bin/addons/base/module/report/ir_module_reference.sxw rename to openerp/addons/base/module/report/ir_module_reference.sxw diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/openerp/addons/base/module/report/ir_module_reference_print.py similarity index 100% rename from bin/addons/base/module/report/ir_module_reference_print.py rename to openerp/addons/base/module/report/ir_module_reference_print.py diff --git a/bin/addons/base/module/wizard/__init__.py b/openerp/addons/base/module/wizard/__init__.py similarity index 100% rename from bin/addons/base/module/wizard/__init__.py rename to openerp/addons/base/module/wizard/__init__.py diff --git a/bin/addons/base/module/wizard/base_export_language.py b/openerp/addons/base/module/wizard/base_export_language.py similarity index 100% rename from bin/addons/base/module/wizard/base_export_language.py rename to openerp/addons/base/module/wizard/base_export_language.py diff --git a/bin/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_export_language_view.xml rename to openerp/addons/base/module/wizard/base_export_language_view.xml diff --git a/bin/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py similarity index 100% rename from bin/addons/base/module/wizard/base_import_language.py rename to openerp/addons/base/module/wizard/base_import_language.py diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_import_language_view.xml rename to openerp/addons/base/module/wizard/base_import_language_view.xml diff --git a/bin/addons/base/module/wizard/base_language_install.py b/openerp/addons/base/module/wizard/base_language_install.py similarity index 100% rename from bin/addons/base/module/wizard/base_language_install.py rename to openerp/addons/base/module/wizard/base_language_install.py diff --git a/bin/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_language_install_view.xml rename to openerp/addons/base/module/wizard/base_language_install_view.xml diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/openerp/addons/base/module/wizard/base_module_configuration.py similarity index 100% rename from bin/addons/base/module/wizard/base_module_configuration.py rename to openerp/addons/base/module/wizard/base_module_configuration.py diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/openerp/addons/base/module/wizard/base_module_configuration_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_module_configuration_view.xml rename to openerp/addons/base/module/wizard/base_module_configuration_view.xml diff --git a/bin/addons/base/module/wizard/base_module_import.py b/openerp/addons/base/module/wizard/base_module_import.py similarity index 100% rename from bin/addons/base/module/wizard/base_module_import.py rename to openerp/addons/base/module/wizard/base_module_import.py diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_module_import_view.xml rename to openerp/addons/base/module/wizard/base_module_import_view.xml diff --git a/bin/addons/base/module/wizard/base_module_scan.py b/openerp/addons/base/module/wizard/base_module_scan.py similarity index 100% rename from bin/addons/base/module/wizard/base_module_scan.py rename to openerp/addons/base/module/wizard/base_module_scan.py diff --git a/bin/addons/base/module/wizard/base_module_scan_view.xml b/openerp/addons/base/module/wizard/base_module_scan_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_module_scan_view.xml rename to openerp/addons/base/module/wizard/base_module_scan_view.xml diff --git a/bin/addons/base/module/wizard/base_module_shortcut_data.xml b/openerp/addons/base/module/wizard/base_module_shortcut_data.xml similarity index 100% rename from bin/addons/base/module/wizard/base_module_shortcut_data.xml rename to openerp/addons/base/module/wizard/base_module_shortcut_data.xml diff --git a/bin/addons/base/module/wizard/base_module_update.py b/openerp/addons/base/module/wizard/base_module_update.py similarity index 100% rename from bin/addons/base/module/wizard/base_module_update.py rename to openerp/addons/base/module/wizard/base_module_update.py diff --git a/bin/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_module_update_view.xml rename to openerp/addons/base/module/wizard/base_module_update_view.xml diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py similarity index 100% rename from bin/addons/base/module/wizard/base_module_upgrade.py rename to openerp/addons/base/module/wizard/base_module_upgrade.py diff --git a/bin/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_module_upgrade_view.xml rename to openerp/addons/base/module/wizard/base_module_upgrade_view.xml diff --git a/bin/addons/base/module/wizard/base_update_translations.py b/openerp/addons/base/module/wizard/base_update_translations.py similarity index 100% rename from bin/addons/base/module/wizard/base_update_translations.py rename to openerp/addons/base/module/wizard/base_update_translations.py diff --git a/bin/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml similarity index 100% rename from bin/addons/base/module/wizard/base_update_translations_view.xml rename to openerp/addons/base/module/wizard/base_update_translations_view.xml diff --git a/bin/addons/base/publisher_warranty/__init__.py b/openerp/addons/base/publisher_warranty/__init__.py similarity index 100% rename from bin/addons/base/publisher_warranty/__init__.py rename to openerp/addons/base/publisher_warranty/__init__.py diff --git a/bin/addons/base/publisher_warranty/publisher_warranty.py b/openerp/addons/base/publisher_warranty/publisher_warranty.py similarity index 100% rename from bin/addons/base/publisher_warranty/publisher_warranty.py rename to openerp/addons/base/publisher_warranty/publisher_warranty.py diff --git a/bin/addons/base/publisher_warranty/publisher_warranty_data.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_data.xml similarity index 100% rename from bin/addons/base/publisher_warranty/publisher_warranty_data.xml rename to openerp/addons/base/publisher_warranty/publisher_warranty_data.xml diff --git a/bin/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml similarity index 100% rename from bin/addons/base/publisher_warranty/publisher_warranty_view.xml rename to openerp/addons/base/publisher_warranty/publisher_warranty_view.xml diff --git a/bin/addons/base/report/corporate_defaults.xml b/openerp/addons/base/report/corporate_defaults.xml similarity index 100% rename from bin/addons/base/report/corporate_defaults.xml rename to openerp/addons/base/report/corporate_defaults.xml diff --git a/bin/addons/base/report/corporate_defaults.xsl b/openerp/addons/base/report/corporate_defaults.xsl similarity index 100% rename from bin/addons/base/report/corporate_defaults.xsl rename to openerp/addons/base/report/corporate_defaults.xsl diff --git a/bin/addons/base/report/corporate_odt_header.xml b/openerp/addons/base/report/corporate_odt_header.xml similarity index 100% rename from bin/addons/base/report/corporate_odt_header.xml rename to openerp/addons/base/report/corporate_odt_header.xml diff --git a/bin/addons/base/report/corporate_sxw_header.xml b/openerp/addons/base/report/corporate_sxw_header.xml similarity index 100% rename from bin/addons/base/report/corporate_sxw_header.xml rename to openerp/addons/base/report/corporate_sxw_header.xml diff --git a/bin/addons/base/report/custom.xsl b/openerp/addons/base/report/custom.xsl similarity index 100% rename from bin/addons/base/report/custom.xsl rename to openerp/addons/base/report/custom.xsl diff --git a/bin/addons/base/report/custom_default.xsl b/openerp/addons/base/report/custom_default.xsl similarity index 100% rename from bin/addons/base/report/custom_default.xsl rename to openerp/addons/base/report/custom_default.xsl diff --git a/bin/addons/base/report/custom_default_printscreen.xsl b/openerp/addons/base/report/custom_default_printscreen.xsl similarity index 100% rename from bin/addons/base/report/custom_default_printscreen.xsl rename to openerp/addons/base/report/custom_default_printscreen.xsl diff --git a/bin/addons/base/report/custom_new.xsl b/openerp/addons/base/report/custom_new.xsl similarity index 100% rename from bin/addons/base/report/custom_new.xsl rename to openerp/addons/base/report/custom_new.xsl diff --git a/bin/addons/base/report/custom_report.xml b/openerp/addons/base/report/custom_report.xml similarity index 100% rename from bin/addons/base/report/custom_report.xml rename to openerp/addons/base/report/custom_report.xml diff --git a/bin/addons/base/report/custom_rml.xsl b/openerp/addons/base/report/custom_rml.xsl similarity index 100% rename from bin/addons/base/report/custom_rml.xsl rename to openerp/addons/base/report/custom_rml.xsl diff --git a/bin/addons/base/report/custom_rml_printscreen.xsl b/openerp/addons/base/report/custom_rml_printscreen.xsl similarity index 100% rename from bin/addons/base/report/custom_rml_printscreen.xsl rename to openerp/addons/base/report/custom_rml_printscreen.xsl diff --git a/bin/addons/base/report/custom_view.xml b/openerp/addons/base/report/custom_view.xml similarity index 100% rename from bin/addons/base/report/custom_view.xml rename to openerp/addons/base/report/custom_view.xml diff --git a/bin/addons/base/report/mako_footer.html b/openerp/addons/base/report/mako_footer.html similarity index 100% rename from bin/addons/base/report/mako_footer.html rename to openerp/addons/base/report/mako_footer.html diff --git a/bin/addons/base/report/mako_header.html b/openerp/addons/base/report/mako_header.html similarity index 100% rename from bin/addons/base/report/mako_header.html rename to openerp/addons/base/report/mako_header.html diff --git a/bin/addons/base/report/mako_template.css b/openerp/addons/base/report/mako_template.css similarity index 100% rename from bin/addons/base/report/mako_template.css rename to openerp/addons/base/report/mako_template.css diff --git a/bin/addons/base/report/rml_template.xsl b/openerp/addons/base/report/rml_template.xsl similarity index 100% rename from bin/addons/base/report/rml_template.xsl rename to openerp/addons/base/report/rml_template.xsl diff --git a/bin/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py similarity index 100% rename from bin/addons/base/res/__init__.py rename to openerp/addons/base/res/__init__.py diff --git a/bin/addons/base/res/bank.py b/openerp/addons/base/res/bank.py similarity index 100% rename from bin/addons/base/res/bank.py rename to openerp/addons/base/res/bank.py diff --git a/bin/addons/base/res/bank_view.xml b/openerp/addons/base/res/bank_view.xml similarity index 100% rename from bin/addons/base/res/bank_view.xml rename to openerp/addons/base/res/bank_view.xml diff --git a/bin/addons/base/res/config_pixmaps/1.png b/openerp/addons/base/res/config_pixmaps/1.png similarity index 100% rename from bin/addons/base/res/config_pixmaps/1.png rename to openerp/addons/base/res/config_pixmaps/1.png diff --git a/bin/addons/base/res/config_pixmaps/2.png b/openerp/addons/base/res/config_pixmaps/2.png similarity index 100% rename from bin/addons/base/res/config_pixmaps/2.png rename to openerp/addons/base/res/config_pixmaps/2.png diff --git a/bin/addons/base/res/config_pixmaps/3.png b/openerp/addons/base/res/config_pixmaps/3.png similarity index 100% rename from bin/addons/base/res/config_pixmaps/3.png rename to openerp/addons/base/res/config_pixmaps/3.png diff --git a/bin/addons/base/res/country.py b/openerp/addons/base/res/country.py similarity index 100% rename from bin/addons/base/res/country.py rename to openerp/addons/base/res/country.py diff --git a/bin/addons/base/res/country_view.xml b/openerp/addons/base/res/country_view.xml similarity index 100% rename from bin/addons/base/res/country_view.xml rename to openerp/addons/base/res/country_view.xml diff --git a/bin/addons/base/res/ir_property.py b/openerp/addons/base/res/ir_property.py similarity index 100% rename from bin/addons/base/res/ir_property.py rename to openerp/addons/base/res/ir_property.py diff --git a/bin/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml similarity index 100% rename from bin/addons/base/res/ir_property_view.xml rename to openerp/addons/base/res/ir_property_view.xml diff --git a/bin/addons/base/res/partner/__init__.py b/openerp/addons/base/res/partner/__init__.py similarity index 100% rename from bin/addons/base/res/partner/__init__.py rename to openerp/addons/base/res/partner/__init__.py diff --git a/bin/addons/base/res/partner/crm.py b/openerp/addons/base/res/partner/crm.py similarity index 100% rename from bin/addons/base/res/partner/crm.py rename to openerp/addons/base/res/partner/crm.py diff --git a/bin/addons/base/res/partner/crm_demo.xml b/openerp/addons/base/res/partner/crm_demo.xml similarity index 100% rename from bin/addons/base/res/partner/crm_demo.xml rename to openerp/addons/base/res/partner/crm_demo.xml diff --git a/bin/addons/base/res/partner/crm_view.xml b/openerp/addons/base/res/partner/crm_view.xml similarity index 100% rename from bin/addons/base/res/partner/crm_view.xml rename to openerp/addons/base/res/partner/crm_view.xml diff --git a/bin/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py similarity index 100% rename from bin/addons/base/res/partner/partner.py rename to openerp/addons/base/res/partner/partner.py diff --git a/bin/addons/base/res/partner/partner_data.xml b/openerp/addons/base/res/partner/partner_data.xml similarity index 100% rename from bin/addons/base/res/partner/partner_data.xml rename to openerp/addons/base/res/partner/partner_data.xml diff --git a/bin/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml similarity index 100% rename from bin/addons/base/res/partner/partner_demo.xml rename to openerp/addons/base/res/partner/partner_demo.xml diff --git a/bin/addons/base/res/partner/partner_report.xml b/openerp/addons/base/res/partner/partner_report.xml similarity index 100% rename from bin/addons/base/res/partner/partner_report.xml rename to openerp/addons/base/res/partner/partner_report.xml diff --git a/bin/addons/base/res/partner/partner_shortcut_data.xml b/openerp/addons/base/res/partner/partner_shortcut_data.xml similarity index 100% rename from bin/addons/base/res/partner/partner_shortcut_data.xml rename to openerp/addons/base/res/partner/partner_shortcut_data.xml diff --git a/bin/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml similarity index 100% rename from bin/addons/base/res/partner/partner_view.xml rename to openerp/addons/base/res/partner/partner_view.xml diff --git a/bin/addons/base/res/partner/report/__init__.py b/openerp/addons/base/res/partner/report/__init__.py similarity index 100% rename from bin/addons/base/res/partner/report/__init__.py rename to openerp/addons/base/res/partner/report/__init__.py diff --git a/bin/addons/base/res/partner/report/business_card.xml b/openerp/addons/base/res/partner/report/business_card.xml similarity index 100% rename from bin/addons/base/res/partner/report/business_card.xml rename to openerp/addons/base/res/partner/report/business_card.xml diff --git a/bin/addons/base/res/partner/report/business_card.xsl b/openerp/addons/base/res/partner/report/business_card.xsl similarity index 100% rename from bin/addons/base/res/partner/report/business_card.xsl rename to openerp/addons/base/res/partner/report/business_card.xsl diff --git a/bin/addons/base/res/partner/report/partner_address.xml b/openerp/addons/base/res/partner/report/partner_address.xml similarity index 100% rename from bin/addons/base/res/partner/report/partner_address.xml rename to openerp/addons/base/res/partner/report/partner_address.xml diff --git a/bin/addons/base/res/partner/report/partner_address.xsl b/openerp/addons/base/res/partner/report/partner_address.xsl similarity index 100% rename from bin/addons/base/res/partner/report/partner_address.xsl rename to openerp/addons/base/res/partner/report/partner_address.xsl diff --git a/bin/addons/base/res/partner/wizard/__init__.py b/openerp/addons/base/res/partner/wizard/__init__.py similarity index 100% rename from bin/addons/base/res/partner/wizard/__init__.py rename to openerp/addons/base/res/partner/wizard/__init__.py diff --git a/bin/addons/base/res/partner/wizard/partner_clear_ids.py b/openerp/addons/base/res/partner/wizard/partner_clear_ids.py similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_clear_ids.py rename to openerp/addons/base/res/partner/wizard/partner_clear_ids.py diff --git a/bin/addons/base/res/partner/wizard/partner_clear_ids_view.xml b/openerp/addons/base/res/partner/wizard/partner_clear_ids_view.xml similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_clear_ids_view.xml rename to openerp/addons/base/res/partner/wizard/partner_clear_ids_view.xml diff --git a/bin/addons/base/res/partner/wizard/partner_sms_send.py b/openerp/addons/base/res/partner/wizard/partner_sms_send.py similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_sms_send.py rename to openerp/addons/base/res/partner/wizard/partner_sms_send.py diff --git a/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml b/openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_sms_send_view.xml rename to openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_ean_check.py b/openerp/addons/base/res/partner/wizard/partner_wizard_ean_check.py similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_wizard_ean_check.py rename to openerp/addons/base/res/partner/wizard/partner_wizard_ean_check.py diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml b/openerp/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml rename to openerp/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_spam.py b/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_wizard_spam.py rename to openerp/addons/base/res/partner/wizard/partner_wizard_spam.py diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml b/openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml similarity index 100% rename from bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml rename to openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml diff --git a/bin/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py similarity index 100% rename from bin/addons/base/res/res_company.py rename to openerp/addons/base/res/res_company.py diff --git a/bin/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml similarity index 100% rename from bin/addons/base/res/res_company_view.xml rename to openerp/addons/base/res/res_company_view.xml diff --git a/bin/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py similarity index 100% rename from bin/addons/base/res/res_config.py rename to openerp/addons/base/res/res_config.py diff --git a/bin/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml similarity index 100% rename from bin/addons/base/res/res_config.xml rename to openerp/addons/base/res/res_config.xml diff --git a/bin/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py similarity index 100% rename from bin/addons/base/res/res_currency.py rename to openerp/addons/base/res/res_currency.py diff --git a/bin/addons/base/res/res_currency_view.xml b/openerp/addons/base/res/res_currency_view.xml similarity index 100% rename from bin/addons/base/res/res_currency_view.xml rename to openerp/addons/base/res/res_currency_view.xml diff --git a/bin/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py similarity index 100% rename from bin/addons/base/res/res_lang.py rename to openerp/addons/base/res/res_lang.py diff --git a/bin/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml similarity index 100% rename from bin/addons/base/res/res_lang_view.xml rename to openerp/addons/base/res/res_lang_view.xml diff --git a/bin/addons/base/res/res_log.py b/openerp/addons/base/res/res_log.py similarity index 100% rename from bin/addons/base/res/res_log.py rename to openerp/addons/base/res/res_log.py diff --git a/bin/addons/base/res/res_log_view.xml b/openerp/addons/base/res/res_log_view.xml similarity index 100% rename from bin/addons/base/res/res_log_view.xml rename to openerp/addons/base/res/res_log_view.xml diff --git a/bin/addons/base/res/res_request.py b/openerp/addons/base/res/res_request.py similarity index 100% rename from bin/addons/base/res/res_request.py rename to openerp/addons/base/res/res_request.py diff --git a/bin/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml similarity index 100% rename from bin/addons/base/res/res_request_view.xml rename to openerp/addons/base/res/res_request_view.xml diff --git a/bin/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml similarity index 100% rename from bin/addons/base/res/res_security.xml rename to openerp/addons/base/res/res_security.xml diff --git a/bin/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py similarity index 100% rename from bin/addons/base/res/res_user.py rename to openerp/addons/base/res/res_user.py diff --git a/bin/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py similarity index 100% rename from bin/addons/base/res/res_widget.py rename to openerp/addons/base/res/res_widget.py diff --git a/bin/addons/base/res/res_widget_data.xml b/openerp/addons/base/res/res_widget_data.xml similarity index 100% rename from bin/addons/base/res/res_widget_data.xml rename to openerp/addons/base/res/res_widget_data.xml diff --git a/bin/addons/base/res/res_widget_demo.xml b/openerp/addons/base/res/res_widget_demo.xml similarity index 100% rename from bin/addons/base/res/res_widget_demo.xml rename to openerp/addons/base/res/res_widget_demo.xml diff --git a/bin/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml similarity index 100% rename from bin/addons/base/res/res_widget_view.xml rename to openerp/addons/base/res/res_widget_view.xml diff --git a/bin/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng similarity index 100% rename from bin/addons/base/rng/view.rng rename to openerp/addons/base/rng/view.rng diff --git a/bin/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml similarity index 100% rename from bin/addons/base/security/base_security.xml rename to openerp/addons/base/security/base_security.xml diff --git a/bin/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv similarity index 100% rename from bin/addons/base/security/ir.model.access.csv rename to openerp/addons/base/security/ir.model.access.csv diff --git a/bin/addons/base/test/base_test.xml b/openerp/addons/base/test/base_test.xml similarity index 100% rename from bin/addons/base/test/base_test.xml rename to openerp/addons/base/test/base_test.xml diff --git a/bin/addons/base/test/base_test.yml b/openerp/addons/base/test/base_test.yml similarity index 100% rename from bin/addons/base/test/base_test.yml rename to openerp/addons/base/test/base_test.yml diff --git a/bin/addons/base/test/bug_lp541545.xml b/openerp/addons/base/test/bug_lp541545.xml similarity index 100% rename from bin/addons/base/test/bug_lp541545.xml rename to openerp/addons/base/test/bug_lp541545.xml diff --git a/bin/addons/base/test/test_auth.yml b/openerp/addons/base/test/test_auth.yml similarity index 100% rename from bin/addons/base/test/test_auth.yml rename to openerp/addons/base/test/test_auth.yml diff --git a/bin/addons/base/test/test_context.xml b/openerp/addons/base/test/test_context.xml similarity index 100% rename from bin/addons/base/test/test_context.xml rename to openerp/addons/base/test/test_context.xml diff --git a/bin/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml similarity index 100% rename from bin/addons/base/test/test_osv_expression.yml rename to openerp/addons/base/test/test_osv_expression.yml diff --git a/bin/addons/base_quality_interrogation.py b/openerp/addons/base_quality_interrogation.py similarity index 100% rename from bin/addons/base_quality_interrogation.py rename to openerp/addons/base_quality_interrogation.py diff --git a/bin/import_xml.rng b/openerp/import_xml.rng similarity index 100% rename from bin/import_xml.rng rename to openerp/import_xml.rng diff --git a/bin/ir/__init__.py b/openerp/ir/__init__.py similarity index 100% rename from bin/ir/__init__.py rename to openerp/ir/__init__.py diff --git a/bin/ir/ir.py b/openerp/ir/ir.py similarity index 96% rename from bin/ir/ir.py rename to openerp/ir/ir.py index c4cc435765d..40a74eb9126 100644 --- a/bin/ir/ir.py +++ b/openerp/ir/ir.py @@ -20,8 +20,8 @@ ############################################################################## import pickle -import osv -import pooler +import openerp.osv as osv +import openerp.pooler as pooler def ir_set(cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None): obj = pooler.get_pool(cr.dbname).get('ir.values') diff --git a/bin/netsvc.py b/openerp/netsvc.py similarity index 84% rename from bin/netsvc.py rename to openerp/netsvc.py index c2360ae5ee7..1b8d54e3c8e 100644 --- a/bin/netsvc.py +++ b/openerp/netsvc.py @@ -37,6 +37,10 @@ from pprint import pformat import warnings import heapq +# TODO modules that import netsvc only for things from loglevels must be changed to use loglevels. +from loglevels import * +import tools + class Service(object): """ Base class for *Local* services @@ -130,27 +134,6 @@ class ExportService(object): else: raise -LOG_NOTSET = 'notset' -LOG_DEBUG_SQL = 'debug_sql' -LOG_DEBUG_RPC_ANSWER = 'debug_rpc_answer' -LOG_DEBUG_RPC = 'debug_rpc' -LOG_DEBUG = 'debug' -LOG_TEST = 'test' -LOG_INFO = 'info' -LOG_WARNING = 'warn' -LOG_ERROR = 'error' -LOG_CRITICAL = 'critical' - -logging.DEBUG_RPC_ANSWER = logging.DEBUG - 4 -logging.addLevelName(logging.DEBUG_RPC_ANSWER, 'DEBUG_RPC_ANSWER') -logging.DEBUG_RPC = logging.DEBUG - 2 -logging.addLevelName(logging.DEBUG_RPC, 'DEBUG_RPC') -logging.DEBUG_SQL = logging.DEBUG_RPC - 3 -logging.addLevelName(logging.DEBUG_SQL, 'DEBUG_SQL') - -logging.TEST = logging.INFO - 5 -logging.addLevelName(logging.TEST, 'TEST') - BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, _NOTHING, DEFAULT = range(10) #The background is set with 40 plus the number of the color, and the foreground with 30 #These are the sequences need to get colored ouput @@ -226,72 +209,10 @@ def init_logger(): # add the handler to the root logger logger = logging.getLogger() + logger.handlers = [] logger.addHandler(handler) logger.setLevel(int(tools.config['log_level'] or '0')) - -class Logger(object): - def __init__(self): - warnings.warn("The netsvc.Logger API shouldn't be used anymore, please " - "use the standard `logging.getLogger` API instead", - PendingDeprecationWarning, stacklevel=2) - super(Logger, self).__init__() - - def notifyChannel(self, name, level, msg): - warnings.warn("notifyChannel API shouldn't be used anymore, please use " - "the standard `logging` module instead", - PendingDeprecationWarning, stacklevel=2) - from service.web_services import common - - log = logging.getLogger(tools.ustr(name)) - - if level in [LOG_DEBUG_RPC, LOG_TEST] and not hasattr(log, level): - fct = lambda msg, *args, **kwargs: log.log(getattr(logging, level.upper()), msg, *args, **kwargs) - setattr(log, level, fct) - - - level_method = getattr(log, level) - - if isinstance(msg, Exception): - msg = tools.exception_to_unicode(msg) - - try: - msg = tools.ustr(msg).strip() - if level in (LOG_ERROR, LOG_CRITICAL) and tools.config.get_misc('debug','env_info',False): - msg = common().exp_get_server_environment() + "\n" + msg - - result = msg.split('\n') - except UnicodeDecodeError: - result = msg.strip().split('\n') - try: - if len(result)>1: - for idx, s in enumerate(result): - level_method('[%02d]: %s' % (idx+1, s,)) - elif result: - level_method(result[0]) - except IOError: - # TODO: perhaps reset the logger streams? - #if logrotate closes our files, we end up here.. - pass - except Exception: - # better ignore the exception and carry on.. - pass - - def set_loglevel(self, level, logger=None): - if logger is not None: - log = logging.getLogger(str(logger)) - else: - log = logging.getLogger() - log.setLevel(logging.INFO) # make sure next msg is printed - log.info("Log level changed to %s" % logging.getLevelName(level)) - log.setLevel(level) - - def shutdown(self): - logging.shutdown() - -import tools -init_logger() - class Agent(object): """Singleton that keeps track of cancellable tasks to run at a given timestamp. diff --git a/bin/osv/__init__.py b/openerp/osv/__init__.py similarity index 100% rename from bin/osv/__init__.py rename to openerp/osv/__init__.py diff --git a/bin/osv/expression.py b/openerp/osv/expression.py similarity index 99% rename from bin/osv/expression.py rename to openerp/osv/expression.py index f83c044c2e4..1922d5e8388 100644 --- a/bin/osv/expression.py +++ b/openerp/osv/expression.py @@ -20,7 +20,7 @@ # ############################################################################## -from tools import flatten, reverse_enumerate +from openerp.tools import flatten, reverse_enumerate import fields diff --git a/bin/osv/fields.py b/openerp/osv/fields.py similarity index 99% rename from bin/osv/fields.py rename to openerp/osv/fields.py index 8a8ff465c7a..bef83646813 100644 --- a/bin/osv/fields.py +++ b/openerp/osv/fields.py @@ -38,9 +38,9 @@ import warnings import xmlrpclib from psycopg2 import Binary -import netsvc -import tools -from tools.translate import _ +import openerp.netsvc as netsvc +import openerp.tools as tools +from openerp.tools.translate import _ def _symbol_set(symb): if symb == None or symb == False: diff --git a/bin/osv/orm.py b/openerp/osv/orm.py similarity index 99% rename from bin/osv/orm.py rename to openerp/osv/orm.py index df458553d3b..d8b7546980b 100644 --- a/bin/osv/orm.py +++ b/openerp/osv/orm.py @@ -49,18 +49,18 @@ import time import traceback import types -import netsvc +import openerp.netsvc as netsvc from lxml import etree -from tools.config import config -from tools.translate import _ +from openerp.tools.config import config +from openerp.tools.translate import _ import fields from query import Query -import tools -from tools.safe_eval import safe_eval as eval +import openerp.tools as tools +from openerp.tools.safe_eval import safe_eval as eval # List of etree._Element subclasses that we choose to ignore when parsing XML. -from tools import SKIPPED_ELEMENT_TYPES +from openerp.tools import SKIPPED_ELEMENT_TYPES regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I) diff --git a/bin/osv/osv.py b/openerp/osv/osv.py similarity index 99% rename from bin/osv/osv.py rename to openerp/osv/osv.py index 138e8c8daab..7dbc8c71cc6 100644 --- a/bin/osv/osv.py +++ b/openerp/osv/osv.py @@ -24,13 +24,13 @@ # import orm -import netsvc -import pooler +import openerp.netsvc as netsvc +import openerp.pooler as pooler import copy import logging from psycopg2 import IntegrityError, errorcodes -from tools.func import wraps -from tools.translate import translate +from openerp.tools.func import wraps +from openerp.tools.translate import translate module_list = [] module_class_list = {} diff --git a/bin/osv/query.py b/openerp/osv/query.py similarity index 100% rename from bin/osv/query.py rename to openerp/osv/query.py diff --git a/bin/pooler.py b/openerp/pooler.py similarity index 94% rename from bin/pooler.py rename to openerp/pooler.py index 684bc6210d4..3b9875c18fc 100644 --- a/bin/pooler.py +++ b/openerp/pooler.py @@ -30,9 +30,9 @@ def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False, if db_name in pool_dic: pool = pool_dic[db_name] else: - import addons - import osv.osv - pool = osv.osv.osv_pool() + import openerp.addons as addons + import openerp.osv.osv as osv_osv + pool = osv_osv.osv_pool() pool_dic[db_name] = pool try: @@ -66,7 +66,7 @@ def get_db_only(db_name): # sql_db must not be loaded before the logger is initialized. # sql_db import psycopg2.tool which create a default logger if there is not. # this resulting of having the logs outputed twice... - import sql_db + import openerp.sql_db as sql_db db = sql_db.db_connect(db_name) return db diff --git a/bin/pychart/__init__.py b/openerp/pychart/__init__.py similarity index 100% rename from bin/pychart/__init__.py rename to openerp/pychart/__init__.py diff --git a/bin/pychart/afm/AvantGarde_Book.py b/openerp/pychart/afm/AvantGarde_Book.py similarity index 100% rename from bin/pychart/afm/AvantGarde_Book.py rename to openerp/pychart/afm/AvantGarde_Book.py diff --git a/bin/pychart/afm/AvantGarde_BookOblique.py b/openerp/pychart/afm/AvantGarde_BookOblique.py similarity index 100% rename from bin/pychart/afm/AvantGarde_BookOblique.py rename to openerp/pychart/afm/AvantGarde_BookOblique.py diff --git a/bin/pychart/afm/AvantGarde_Demi.py b/openerp/pychart/afm/AvantGarde_Demi.py similarity index 100% rename from bin/pychart/afm/AvantGarde_Demi.py rename to openerp/pychart/afm/AvantGarde_Demi.py diff --git a/bin/pychart/afm/AvantGarde_DemiOblique.py b/openerp/pychart/afm/AvantGarde_DemiOblique.py similarity index 100% rename from bin/pychart/afm/AvantGarde_DemiOblique.py rename to openerp/pychart/afm/AvantGarde_DemiOblique.py diff --git a/bin/pychart/afm/Bookman_Demi.py b/openerp/pychart/afm/Bookman_Demi.py similarity index 100% rename from bin/pychart/afm/Bookman_Demi.py rename to openerp/pychart/afm/Bookman_Demi.py diff --git a/bin/pychart/afm/Bookman_DemiItalic.py b/openerp/pychart/afm/Bookman_DemiItalic.py similarity index 100% rename from bin/pychart/afm/Bookman_DemiItalic.py rename to openerp/pychart/afm/Bookman_DemiItalic.py diff --git a/bin/pychart/afm/Bookman_Light.py b/openerp/pychart/afm/Bookman_Light.py similarity index 100% rename from bin/pychart/afm/Bookman_Light.py rename to openerp/pychart/afm/Bookman_Light.py diff --git a/bin/pychart/afm/Bookman_LightItalic.py b/openerp/pychart/afm/Bookman_LightItalic.py similarity index 100% rename from bin/pychart/afm/Bookman_LightItalic.py rename to openerp/pychart/afm/Bookman_LightItalic.py diff --git a/bin/pychart/afm/Courier.py b/openerp/pychart/afm/Courier.py similarity index 100% rename from bin/pychart/afm/Courier.py rename to openerp/pychart/afm/Courier.py diff --git a/bin/pychart/afm/Courier_Bold.py b/openerp/pychart/afm/Courier_Bold.py similarity index 100% rename from bin/pychart/afm/Courier_Bold.py rename to openerp/pychart/afm/Courier_Bold.py diff --git a/bin/pychart/afm/Courier_BoldOblique.py b/openerp/pychart/afm/Courier_BoldOblique.py similarity index 100% rename from bin/pychart/afm/Courier_BoldOblique.py rename to openerp/pychart/afm/Courier_BoldOblique.py diff --git a/bin/pychart/afm/Courier_Oblique.py b/openerp/pychart/afm/Courier_Oblique.py similarity index 100% rename from bin/pychart/afm/Courier_Oblique.py rename to openerp/pychart/afm/Courier_Oblique.py diff --git a/bin/pychart/afm/Helvetica.py b/openerp/pychart/afm/Helvetica.py similarity index 100% rename from bin/pychart/afm/Helvetica.py rename to openerp/pychart/afm/Helvetica.py diff --git a/bin/pychart/afm/Helvetica_Bold.py b/openerp/pychart/afm/Helvetica_Bold.py similarity index 100% rename from bin/pychart/afm/Helvetica_Bold.py rename to openerp/pychart/afm/Helvetica_Bold.py diff --git a/bin/pychart/afm/Helvetica_BoldOblique.py b/openerp/pychart/afm/Helvetica_BoldOblique.py similarity index 100% rename from bin/pychart/afm/Helvetica_BoldOblique.py rename to openerp/pychart/afm/Helvetica_BoldOblique.py diff --git a/bin/pychart/afm/Helvetica_Light.py b/openerp/pychart/afm/Helvetica_Light.py similarity index 100% rename from bin/pychart/afm/Helvetica_Light.py rename to openerp/pychart/afm/Helvetica_Light.py diff --git a/bin/pychart/afm/Helvetica_LightOblique.py b/openerp/pychart/afm/Helvetica_LightOblique.py similarity index 100% rename from bin/pychart/afm/Helvetica_LightOblique.py rename to openerp/pychart/afm/Helvetica_LightOblique.py diff --git a/bin/pychart/afm/Helvetica_Narrow.py b/openerp/pychart/afm/Helvetica_Narrow.py similarity index 100% rename from bin/pychart/afm/Helvetica_Narrow.py rename to openerp/pychart/afm/Helvetica_Narrow.py diff --git a/bin/pychart/afm/Helvetica_Narrow_Bold.py b/openerp/pychart/afm/Helvetica_Narrow_Bold.py similarity index 100% rename from bin/pychart/afm/Helvetica_Narrow_Bold.py rename to openerp/pychart/afm/Helvetica_Narrow_Bold.py diff --git a/bin/pychart/afm/Helvetica_Narrow_BoldOblique.py b/openerp/pychart/afm/Helvetica_Narrow_BoldOblique.py similarity index 100% rename from bin/pychart/afm/Helvetica_Narrow_BoldOblique.py rename to openerp/pychart/afm/Helvetica_Narrow_BoldOblique.py diff --git a/bin/pychart/afm/Helvetica_Narrow_Oblique.py b/openerp/pychart/afm/Helvetica_Narrow_Oblique.py similarity index 100% rename from bin/pychart/afm/Helvetica_Narrow_Oblique.py rename to openerp/pychart/afm/Helvetica_Narrow_Oblique.py diff --git a/bin/pychart/afm/Helvetica_Oblique.py b/openerp/pychart/afm/Helvetica_Oblique.py similarity index 100% rename from bin/pychart/afm/Helvetica_Oblique.py rename to openerp/pychart/afm/Helvetica_Oblique.py diff --git a/bin/pychart/afm/NewCenturySchlbk_Bold.py b/openerp/pychart/afm/NewCenturySchlbk_Bold.py similarity index 100% rename from bin/pychart/afm/NewCenturySchlbk_Bold.py rename to openerp/pychart/afm/NewCenturySchlbk_Bold.py diff --git a/bin/pychart/afm/NewCenturySchlbk_BoldItalic.py b/openerp/pychart/afm/NewCenturySchlbk_BoldItalic.py similarity index 100% rename from bin/pychart/afm/NewCenturySchlbk_BoldItalic.py rename to openerp/pychart/afm/NewCenturySchlbk_BoldItalic.py diff --git a/bin/pychart/afm/NewCenturySchlbk_Italic.py b/openerp/pychart/afm/NewCenturySchlbk_Italic.py similarity index 100% rename from bin/pychart/afm/NewCenturySchlbk_Italic.py rename to openerp/pychart/afm/NewCenturySchlbk_Italic.py diff --git a/bin/pychart/afm/NewCenturySchlbk_Roman.py b/openerp/pychart/afm/NewCenturySchlbk_Roman.py similarity index 100% rename from bin/pychart/afm/NewCenturySchlbk_Roman.py rename to openerp/pychart/afm/NewCenturySchlbk_Roman.py diff --git a/bin/pychart/afm/Palatino_Bold.py b/openerp/pychart/afm/Palatino_Bold.py similarity index 100% rename from bin/pychart/afm/Palatino_Bold.py rename to openerp/pychart/afm/Palatino_Bold.py diff --git a/bin/pychart/afm/Palatino_BoldItalic.py b/openerp/pychart/afm/Palatino_BoldItalic.py similarity index 100% rename from bin/pychart/afm/Palatino_BoldItalic.py rename to openerp/pychart/afm/Palatino_BoldItalic.py diff --git a/bin/pychart/afm/Palatino_Italic.py b/openerp/pychart/afm/Palatino_Italic.py similarity index 100% rename from bin/pychart/afm/Palatino_Italic.py rename to openerp/pychart/afm/Palatino_Italic.py diff --git a/bin/pychart/afm/Palatino_Roman.py b/openerp/pychart/afm/Palatino_Roman.py similarity index 100% rename from bin/pychart/afm/Palatino_Roman.py rename to openerp/pychart/afm/Palatino_Roman.py diff --git a/bin/pychart/afm/Symbol.py b/openerp/pychart/afm/Symbol.py similarity index 100% rename from bin/pychart/afm/Symbol.py rename to openerp/pychart/afm/Symbol.py diff --git a/bin/pychart/afm/Times_Bold.py b/openerp/pychart/afm/Times_Bold.py similarity index 100% rename from bin/pychart/afm/Times_Bold.py rename to openerp/pychart/afm/Times_Bold.py diff --git a/bin/pychart/afm/Times_BoldItalic.py b/openerp/pychart/afm/Times_BoldItalic.py similarity index 100% rename from bin/pychart/afm/Times_BoldItalic.py rename to openerp/pychart/afm/Times_BoldItalic.py diff --git a/bin/pychart/afm/Times_Italic.py b/openerp/pychart/afm/Times_Italic.py similarity index 100% rename from bin/pychart/afm/Times_Italic.py rename to openerp/pychart/afm/Times_Italic.py diff --git a/bin/pychart/afm/Times_Roman.py b/openerp/pychart/afm/Times_Roman.py similarity index 100% rename from bin/pychart/afm/Times_Roman.py rename to openerp/pychart/afm/Times_Roman.py diff --git a/bin/pychart/afm/Utopia_Bold.py b/openerp/pychart/afm/Utopia_Bold.py similarity index 100% rename from bin/pychart/afm/Utopia_Bold.py rename to openerp/pychart/afm/Utopia_Bold.py diff --git a/bin/pychart/afm/Utopia_BoldItalic.py b/openerp/pychart/afm/Utopia_BoldItalic.py similarity index 100% rename from bin/pychart/afm/Utopia_BoldItalic.py rename to openerp/pychart/afm/Utopia_BoldItalic.py diff --git a/bin/pychart/afm/Utopia_Italic.py b/openerp/pychart/afm/Utopia_Italic.py similarity index 100% rename from bin/pychart/afm/Utopia_Italic.py rename to openerp/pychart/afm/Utopia_Italic.py diff --git a/bin/pychart/afm/Utopia_Regular.py b/openerp/pychart/afm/Utopia_Regular.py similarity index 100% rename from bin/pychart/afm/Utopia_Regular.py rename to openerp/pychart/afm/Utopia_Regular.py diff --git a/bin/pychart/afm/ZapfChancery_MediumItalic.py b/openerp/pychart/afm/ZapfChancery_MediumItalic.py similarity index 100% rename from bin/pychart/afm/ZapfChancery_MediumItalic.py rename to openerp/pychart/afm/ZapfChancery_MediumItalic.py diff --git a/bin/pychart/afm/ZapfDingbats.py b/openerp/pychart/afm/ZapfDingbats.py similarity index 100% rename from bin/pychart/afm/ZapfDingbats.py rename to openerp/pychart/afm/ZapfDingbats.py diff --git a/bin/pychart/afm/__init__.py b/openerp/pychart/afm/__init__.py similarity index 100% rename from bin/pychart/afm/__init__.py rename to openerp/pychart/afm/__init__.py diff --git a/bin/pychart/afm/dir.py b/openerp/pychart/afm/dir.py similarity index 100% rename from bin/pychart/afm/dir.py rename to openerp/pychart/afm/dir.py diff --git a/bin/pychart/area.py b/openerp/pychart/area.py similarity index 100% rename from bin/pychart/area.py rename to openerp/pychart/area.py diff --git a/bin/pychart/area_doc.py b/openerp/pychart/area_doc.py similarity index 100% rename from bin/pychart/area_doc.py rename to openerp/pychart/area_doc.py diff --git a/bin/pychart/arrow.py b/openerp/pychart/arrow.py similarity index 100% rename from bin/pychart/arrow.py rename to openerp/pychart/arrow.py diff --git a/bin/pychart/arrow_doc.py b/openerp/pychart/arrow_doc.py similarity index 100% rename from bin/pychart/arrow_doc.py rename to openerp/pychart/arrow_doc.py diff --git a/bin/pychart/axis.py b/openerp/pychart/axis.py similarity index 100% rename from bin/pychart/axis.py rename to openerp/pychart/axis.py diff --git a/bin/pychart/axis_doc.py b/openerp/pychart/axis_doc.py similarity index 100% rename from bin/pychart/axis_doc.py rename to openerp/pychart/axis_doc.py diff --git a/bin/pychart/axis_x_doc.py b/openerp/pychart/axis_x_doc.py similarity index 100% rename from bin/pychart/axis_x_doc.py rename to openerp/pychart/axis_x_doc.py diff --git a/bin/pychart/axis_y_doc.py b/openerp/pychart/axis_y_doc.py similarity index 100% rename from bin/pychart/axis_y_doc.py rename to openerp/pychart/axis_y_doc.py diff --git a/bin/pychart/bar_plot.py b/openerp/pychart/bar_plot.py similarity index 100% rename from bin/pychart/bar_plot.py rename to openerp/pychart/bar_plot.py diff --git a/bin/pychart/bar_plot_doc.py b/openerp/pychart/bar_plot_doc.py similarity index 100% rename from bin/pychart/bar_plot_doc.py rename to openerp/pychart/bar_plot_doc.py diff --git a/bin/pychart/basecanvas.py b/openerp/pychart/basecanvas.py similarity index 100% rename from bin/pychart/basecanvas.py rename to openerp/pychart/basecanvas.py diff --git a/bin/pychart/canvas.py b/openerp/pychart/canvas.py similarity index 100% rename from bin/pychart/canvas.py rename to openerp/pychart/canvas.py diff --git a/bin/pychart/category_coord.py b/openerp/pychart/category_coord.py similarity index 100% rename from bin/pychart/category_coord.py rename to openerp/pychart/category_coord.py diff --git a/bin/pychart/chart_data.py b/openerp/pychart/chart_data.py similarity index 100% rename from bin/pychart/chart_data.py rename to openerp/pychart/chart_data.py diff --git a/bin/pychart/chart_object.py b/openerp/pychart/chart_object.py similarity index 100% rename from bin/pychart/chart_object.py rename to openerp/pychart/chart_object.py diff --git a/bin/pychart/color.py b/openerp/pychart/color.py similarity index 100% rename from bin/pychart/color.py rename to openerp/pychart/color.py diff --git a/bin/pychart/color_doc.py b/openerp/pychart/color_doc.py similarity index 100% rename from bin/pychart/color_doc.py rename to openerp/pychart/color_doc.py diff --git a/bin/pychart/coord.py b/openerp/pychart/coord.py similarity index 100% rename from bin/pychart/coord.py rename to openerp/pychart/coord.py diff --git a/bin/pychart/doc_support.py b/openerp/pychart/doc_support.py similarity index 100% rename from bin/pychart/doc_support.py rename to openerp/pychart/doc_support.py diff --git a/bin/pychart/empty_docs.py b/openerp/pychart/empty_docs.py similarity index 100% rename from bin/pychart/empty_docs.py rename to openerp/pychart/empty_docs.py diff --git a/bin/pychart/error_bar.py b/openerp/pychart/error_bar.py similarity index 100% rename from bin/pychart/error_bar.py rename to openerp/pychart/error_bar.py diff --git a/bin/pychart/error_bar_doc.py b/openerp/pychart/error_bar_doc.py similarity index 100% rename from bin/pychart/error_bar_doc.py rename to openerp/pychart/error_bar_doc.py diff --git a/bin/pychart/fill_style.py b/openerp/pychart/fill_style.py similarity index 100% rename from bin/pychart/fill_style.py rename to openerp/pychart/fill_style.py diff --git a/bin/pychart/fill_style_doc.py b/openerp/pychart/fill_style_doc.py similarity index 100% rename from bin/pychart/fill_style_doc.py rename to openerp/pychart/fill_style_doc.py diff --git a/bin/pychart/font.py b/openerp/pychart/font.py similarity index 100% rename from bin/pychart/font.py rename to openerp/pychart/font.py diff --git a/bin/pychart/generate_docs.py b/openerp/pychart/generate_docs.py similarity index 100% rename from bin/pychart/generate_docs.py rename to openerp/pychart/generate_docs.py diff --git a/bin/pychart/gs_frontend.py b/openerp/pychart/gs_frontend.py similarity index 100% rename from bin/pychart/gs_frontend.py rename to openerp/pychart/gs_frontend.py diff --git a/bin/pychart/interval_bar_plot.py b/openerp/pychart/interval_bar_plot.py similarity index 100% rename from bin/pychart/interval_bar_plot.py rename to openerp/pychart/interval_bar_plot.py diff --git a/bin/pychart/legend.py b/openerp/pychart/legend.py similarity index 100% rename from bin/pychart/legend.py rename to openerp/pychart/legend.py diff --git a/bin/pychart/legend_doc.py b/openerp/pychart/legend_doc.py similarity index 100% rename from bin/pychart/legend_doc.py rename to openerp/pychart/legend_doc.py diff --git a/bin/pychart/line_plot.py b/openerp/pychart/line_plot.py similarity index 100% rename from bin/pychart/line_plot.py rename to openerp/pychart/line_plot.py diff --git a/bin/pychart/line_plot_doc.py b/openerp/pychart/line_plot_doc.py similarity index 100% rename from bin/pychart/line_plot_doc.py rename to openerp/pychart/line_plot_doc.py diff --git a/bin/pychart/line_style.py b/openerp/pychart/line_style.py similarity index 100% rename from bin/pychart/line_style.py rename to openerp/pychart/line_style.py diff --git a/bin/pychart/line_style_doc.py b/openerp/pychart/line_style_doc.py similarity index 100% rename from bin/pychart/line_style_doc.py rename to openerp/pychart/line_style_doc.py diff --git a/bin/pychart/linear_coord.py b/openerp/pychart/linear_coord.py similarity index 100% rename from bin/pychart/linear_coord.py rename to openerp/pychart/linear_coord.py diff --git a/bin/pychart/log_coord.py b/openerp/pychart/log_coord.py similarity index 100% rename from bin/pychart/log_coord.py rename to openerp/pychart/log_coord.py diff --git a/bin/pychart/object_set.py b/openerp/pychart/object_set.py similarity index 100% rename from bin/pychart/object_set.py rename to openerp/pychart/object_set.py diff --git a/bin/pychart/pdfcanvas.py b/openerp/pychart/pdfcanvas.py similarity index 100% rename from bin/pychart/pdfcanvas.py rename to openerp/pychart/pdfcanvas.py diff --git a/bin/pychart/pie_plot.py b/openerp/pychart/pie_plot.py similarity index 100% rename from bin/pychart/pie_plot.py rename to openerp/pychart/pie_plot.py diff --git a/bin/pychart/pie_plot_doc.py b/openerp/pychart/pie_plot_doc.py similarity index 100% rename from bin/pychart/pie_plot_doc.py rename to openerp/pychart/pie_plot_doc.py diff --git a/bin/pychart/pngcanvas.py b/openerp/pychart/pngcanvas.py similarity index 100% rename from bin/pychart/pngcanvas.py rename to openerp/pychart/pngcanvas.py diff --git a/bin/pychart/pscanvas.py b/openerp/pychart/pscanvas.py similarity index 100% rename from bin/pychart/pscanvas.py rename to openerp/pychart/pscanvas.py diff --git a/bin/pychart/pychart_types.py b/openerp/pychart/pychart_types.py similarity index 100% rename from bin/pychart/pychart_types.py rename to openerp/pychart/pychart_types.py diff --git a/bin/pychart/pychart_util.py b/openerp/pychart/pychart_util.py similarity index 100% rename from bin/pychart/pychart_util.py rename to openerp/pychart/pychart_util.py diff --git a/bin/pychart/range_plot.py b/openerp/pychart/range_plot.py similarity index 100% rename from bin/pychart/range_plot.py rename to openerp/pychart/range_plot.py diff --git a/bin/pychart/range_plot_doc.py b/openerp/pychart/range_plot_doc.py similarity index 100% rename from bin/pychart/range_plot_doc.py rename to openerp/pychart/range_plot_doc.py diff --git a/bin/pychart/rose_plot.py b/openerp/pychart/rose_plot.py similarity index 100% rename from bin/pychart/rose_plot.py rename to openerp/pychart/rose_plot.py diff --git a/bin/pychart/scaling.py b/openerp/pychart/scaling.py similarity index 100% rename from bin/pychart/scaling.py rename to openerp/pychart/scaling.py diff --git a/bin/pychart/svgcanvas.py b/openerp/pychart/svgcanvas.py similarity index 100% rename from bin/pychart/svgcanvas.py rename to openerp/pychart/svgcanvas.py diff --git a/bin/pychart/text_box.py b/openerp/pychart/text_box.py similarity index 100% rename from bin/pychart/text_box.py rename to openerp/pychart/text_box.py diff --git a/bin/pychart/text_box_doc.py b/openerp/pychart/text_box_doc.py similarity index 100% rename from bin/pychart/text_box_doc.py rename to openerp/pychart/text_box_doc.py diff --git a/bin/pychart/theme.py b/openerp/pychart/theme.py similarity index 100% rename from bin/pychart/theme.py rename to openerp/pychart/theme.py diff --git a/bin/pychart/tick_mark.py b/openerp/pychart/tick_mark.py similarity index 100% rename from bin/pychart/tick_mark.py rename to openerp/pychart/tick_mark.py diff --git a/bin/pychart/tick_mark_doc.py b/openerp/pychart/tick_mark_doc.py similarity index 100% rename from bin/pychart/tick_mark_doc.py rename to openerp/pychart/tick_mark_doc.py diff --git a/bin/pychart/typechecker.py b/openerp/pychart/typechecker.py similarity index 100% rename from bin/pychart/typechecker.py rename to openerp/pychart/typechecker.py diff --git a/bin/pychart/version.py b/openerp/pychart/version.py similarity index 100% rename from bin/pychart/version.py rename to openerp/pychart/version.py diff --git a/bin/pychart/x11canvas.py b/openerp/pychart/x11canvas.py similarity index 100% rename from bin/pychart/x11canvas.py rename to openerp/pychart/x11canvas.py diff --git a/bin/pychart/zap.py b/openerp/pychart/zap.py similarity index 100% rename from bin/pychart/zap.py rename to openerp/pychart/zap.py diff --git a/bin/release.py b/openerp/release.py similarity index 100% rename from bin/release.py rename to openerp/release.py diff --git a/bin/report/__init__.py b/openerp/report/__init__.py similarity index 98% rename from bin/report/__init__.py rename to openerp/report/__init__.py index 4cadd711738..ca2b86d9731 100644 --- a/bin/report/__init__.py +++ b/openerp/report/__init__.py @@ -24,7 +24,7 @@ import print_xml import print_fnc import custom import render -import pychart +import openerp.pychart import int_to_text import report_sxw diff --git a/bin/report/common.py b/openerp/report/common.py similarity index 100% rename from bin/report/common.py rename to openerp/report/common.py diff --git a/bin/report/custom.py b/openerp/report/custom.py similarity index 98% rename from bin/report/custom.py rename to openerp/report/custom.py index 4b02901bdb2..f3d6cfbc074 100644 --- a/bin/report/custom.py +++ b/openerp/report/custom.py @@ -21,23 +21,23 @@ import os import time -import netsvc +import openerp.netsvc as netsvc -import tools -from tools.safe_eval import safe_eval as eval +import openerp.tools as tools +from openerp.tools.safe_eval import safe_eval as eval import print_xml import render from interface import report_int import common -from osv.osv import except_osv -from osv.orm import browse_null -from osv.orm import browse_record_list -import pooler +from openerp.osv.osv import except_osv +from openerp.osv.orm import browse_null +from openerp.osv.orm import browse_record_list +import openerp.pooler as pooler from pychart import * import misc import cStringIO from lxml import etree -from tools.translate import _ +from openerp.tools.translate import _ class external_pdf(render.render): def __init__(self, pdf): diff --git a/bin/report/int_to_text.py b/openerp/report/int_to_text.py similarity index 100% rename from bin/report/int_to_text.py rename to openerp/report/int_to_text.py diff --git a/bin/report/interface.py b/openerp/report/interface.py similarity index 98% rename from bin/report/interface.py rename to openerp/report/interface.py index 36f54b31fdb..fca5121896f 100644 --- a/bin/report/interface.py +++ b/openerp/report/interface.py @@ -23,11 +23,11 @@ import os import re from lxml import etree -import netsvc -import pooler +import openerp.netsvc as netsvc +import openerp.pooler as pooler -import tools -import addons +import openerp.tools as tools +import openerp.addons as addons import print_xml import render import urllib diff --git a/bin/report/misc.py b/openerp/report/misc.py similarity index 100% rename from bin/report/misc.py rename to openerp/report/misc.py diff --git a/bin/report/preprocess.py b/openerp/report/preprocess.py similarity index 100% rename from bin/report/preprocess.py rename to openerp/report/preprocess.py diff --git a/bin/report/print_fnc.py b/openerp/report/print_fnc.py similarity index 100% rename from bin/report/print_fnc.py rename to openerp/report/print_fnc.py diff --git a/bin/report/print_xml.py b/openerp/report/print_xml.py similarity index 98% rename from bin/report/print_xml.py rename to openerp/report/print_xml.py index d637603d341..ad2b0528d99 100644 --- a/bin/report/print_xml.py +++ b/openerp/report/print_xml.py @@ -21,13 +21,13 @@ import os,types from lxml import etree -import netsvc -import tools -from tools.safe_eval import safe_eval +import openerp.netsvc as netsvc +import openerp.tools as tools +from openerp.tools.safe_eval import safe_eval import print_fnc import copy -from osv.orm import browse_null, browse_record -import pooler +from openerp.osv.orm import browse_null, browse_record +import openerp.pooler as pooler class InheritDict(dict): # Might be usefull when we're doing name lookup for call or eval. diff --git a/bin/report/printscreen/__init__.py b/openerp/report/printscreen/__init__.py similarity index 100% rename from bin/report/printscreen/__init__.py rename to openerp/report/printscreen/__init__.py diff --git a/bin/report/printscreen/ps_form.py b/openerp/report/printscreen/ps_form.py similarity index 97% rename from bin/report/printscreen/ps_form.py rename to openerp/report/printscreen/ps_form.py index 227e3084bbf..d997f1eb038 100644 --- a/bin/report/printscreen/ps_form.py +++ b/openerp/report/printscreen/ps_form.py @@ -19,11 +19,11 @@ # ############################################################################## -from report.interface import report_int -import pooler -import tools +from openerp.report.interface import report_int +import openerp.pooler as pooler +import openerp.tools as tools -from report import render +from openerp.report import render from lxml import etree import time, os diff --git a/bin/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py similarity index 98% rename from bin/report/printscreen/ps_list.py rename to openerp/report/printscreen/ps_list.py index fd1169b199e..851945922ab 100644 --- a/bin/report/printscreen/ps_list.py +++ b/openerp/report/printscreen/ps_list.py @@ -19,18 +19,17 @@ # ############################################################################## -from report.interface import report_int -import pooler -import tools -from tools.safe_eval import safe_eval as eval +from openerp.report.interface import report_int +import openerp.pooler as pooler +import openerp.tools as tools +from openerp.tools.safe_eval import safe_eval as eval from lxml import etree -from report import render +from openerp.report import render, report_sxw import locale import time, os from operator import itemgetter from datetime import datetime -from report import report_sxw class report_printscreen_list(report_int): def __init__(self, name): diff --git a/bin/report/pyPdf/__init__.py b/openerp/report/pyPdf/__init__.py similarity index 100% rename from bin/report/pyPdf/__init__.py rename to openerp/report/pyPdf/__init__.py diff --git a/bin/report/pyPdf/filters.py b/openerp/report/pyPdf/filters.py similarity index 100% rename from bin/report/pyPdf/filters.py rename to openerp/report/pyPdf/filters.py diff --git a/bin/report/pyPdf/generic.py b/openerp/report/pyPdf/generic.py similarity index 100% rename from bin/report/pyPdf/generic.py rename to openerp/report/pyPdf/generic.py diff --git a/bin/report/pyPdf/pdf.py b/openerp/report/pyPdf/pdf.py similarity index 100% rename from bin/report/pyPdf/pdf.py rename to openerp/report/pyPdf/pdf.py diff --git a/bin/report/pyPdf/utils.py b/openerp/report/pyPdf/utils.py similarity index 100% rename from bin/report/pyPdf/utils.py rename to openerp/report/pyPdf/utils.py diff --git a/bin/report/pyPdf/xmp.py b/openerp/report/pyPdf/xmp.py similarity index 100% rename from bin/report/pyPdf/xmp.py rename to openerp/report/pyPdf/xmp.py diff --git a/bin/report/render/__init__.py b/openerp/report/render/__init__.py similarity index 100% rename from bin/report/render/__init__.py rename to openerp/report/render/__init__.py diff --git a/bin/report/render/html2html/__init__.py b/openerp/report/render/html2html/__init__.py similarity index 100% rename from bin/report/render/html2html/__init__.py rename to openerp/report/render/html2html/__init__.py diff --git a/bin/report/render/html2html/html2html.py b/openerp/report/render/html2html/html2html.py similarity index 98% rename from bin/report/render/html2html/html2html.py rename to openerp/report/render/html2html/html2html.py index dfd92a70b52..9847c4412e3 100644 --- a/bin/report/render/html2html/html2html.py +++ b/openerp/report/render/html2html/html2html.py @@ -19,10 +19,10 @@ # ############################################################################## -from report.render.rml2pdf import utils +from openerp.report.render.rml2pdf import utils from lxml import etree import copy -import pooler +import openerp.pooler as pooler import base64 import cStringIO import re diff --git a/bin/report/render/makohtml2html/__init__.py b/openerp/report/render/makohtml2html/__init__.py similarity index 100% rename from bin/report/render/makohtml2html/__init__.py rename to openerp/report/render/makohtml2html/__init__.py diff --git a/bin/report/render/makohtml2html/makohtml2html.py b/openerp/report/render/makohtml2html/makohtml2html.py similarity index 98% rename from bin/report/render/makohtml2html/makohtml2html.py rename to openerp/report/render/makohtml2html/makohtml2html.py index a20de5b02e6..9241862d251 100644 --- a/bin/report/render/makohtml2html/makohtml2html.py +++ b/openerp/report/render/makohtml2html/makohtml2html.py @@ -22,7 +22,7 @@ import mako from lxml import etree from mako.template import Template from mako.lookup import TemplateLookup -import netsvc +import openerp.netsvc as netsvc import traceback, sys, os class makohtml2html(object): @@ -130,4 +130,4 @@ class makohtml2html(object): def parseNode(html, localcontext = {}): r = makohtml2html(html, localcontext) - return r.render() \ No newline at end of file + return r.render() diff --git a/bin/report/render/odt2odt/__init__.py b/openerp/report/render/odt2odt/__init__.py similarity index 100% rename from bin/report/render/odt2odt/__init__.py rename to openerp/report/render/odt2odt/__init__.py diff --git a/bin/report/render/odt2odt/odt2odt.py b/openerp/report/render/odt2odt/odt2odt.py similarity index 97% rename from bin/report/render/odt2odt/odt2odt.py rename to openerp/report/render/odt2odt/odt2odt.py index 5df5472e262..a28ec904a22 100644 --- a/bin/report/render/odt2odt/odt2odt.py +++ b/openerp/report/render/odt2odt/odt2odt.py @@ -19,7 +19,7 @@ # ############################################################################## -from report.render.rml2pdf import utils +from openerp.report.render.rml2pdf import utils from lxml import etree import copy diff --git a/bin/report/render/render.py b/openerp/report/render/render.py similarity index 100% rename from bin/report/render/render.py rename to openerp/report/render/render.py diff --git a/bin/report/render/rml.py b/openerp/report/render/rml.py similarity index 100% rename from bin/report/render/rml.py rename to openerp/report/render/rml.py diff --git a/bin/report/render/rml2html/__init__.py b/openerp/report/render/rml2html/__init__.py similarity index 100% rename from bin/report/render/rml2html/__init__.py rename to openerp/report/render/rml2html/__init__.py diff --git a/bin/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py similarity index 99% rename from bin/report/render/rml2html/rml2html.py rename to openerp/report/render/rml2html/rml2html.py index 381cb0481d5..504492772df 100644 --- a/bin/report/render/rml2html/rml2html.py +++ b/openerp/report/render/rml2html/rml2html.py @@ -40,7 +40,7 @@ import cStringIO from lxml import etree import copy import utils -from report.render.rml2pdf import utils +from openerp.report.render.rml2pdf import utils class _flowable(object): def __init__(self, template, doc, localcontext = None): diff --git a/bin/report/render/rml2html/utils.py b/openerp/report/render/rml2html/utils.py similarity index 100% rename from bin/report/render/rml2html/utils.py rename to openerp/report/render/rml2html/utils.py diff --git a/bin/report/render/rml2pdf/__init__.py b/openerp/report/render/rml2pdf/__init__.py similarity index 100% rename from bin/report/render/rml2pdf/__init__.py rename to openerp/report/render/rml2pdf/__init__.py diff --git a/bin/report/render/rml2pdf/color.py b/openerp/report/render/rml2pdf/color.py similarity index 100% rename from bin/report/render/rml2pdf/color.py rename to openerp/report/render/rml2pdf/color.py diff --git a/bin/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py similarity index 99% rename from bin/report/render/rml2pdf/customfonts.py rename to openerp/report/render/rml2pdf/customfonts.py index ccbcd2c1a4a..17a8a9c0ab7 100644 --- a/bin/report/render/rml2pdf/customfonts.py +++ b/openerp/report/render/rml2pdf/customfonts.py @@ -26,7 +26,7 @@ import os import platform from reportlab import rl_config -from tools import config +from openerp.tools import config """This module allows the mapping of some system-available TTF fonts to the reportlab engine. diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py similarity index 99% rename from bin/report/render/rml2pdf/trml2pdf.py rename to openerp/report/render/rml2pdf/trml2pdf.py index df826d0eace..615be94d712 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -33,9 +33,9 @@ import logging from lxml import etree import base64 from reportlab.platypus.doctemplate import ActionFlowable -from tools.safe_eval import safe_eval as eval +from openerp.tools.safe_eval import safe_eval as eval from reportlab.lib.units import inch,cm,mm -from tools.misc import file_open +from openerp.tools.misc import file_open from reportlab.pdfbase import pdfmetrics try: diff --git a/bin/report/render/rml2pdf/utils.py b/openerp/report/render/rml2pdf/utils.py similarity index 98% rename from bin/report/render/rml2pdf/utils.py rename to openerp/report/render/rml2pdf/utils.py index e631fcd9566..1eeb7b70f66 100644 --- a/bin/report/render/rml2pdf/utils.py +++ b/openerp/report/render/rml2pdf/utils.py @@ -43,9 +43,9 @@ import logging import re import reportlab -import tools -from tools.safe_eval import safe_eval as eval -from tools import ustr +import openerp.tools as tools +from openerp.tools.safe_eval import safe_eval as eval +from openerp.tools.misc import ustr _regex = re.compile('\[\[(.+?)\]\]') diff --git a/bin/report/render/rml2txt/__init__.py b/openerp/report/render/rml2txt/__init__.py similarity index 100% rename from bin/report/render/rml2txt/__init__.py rename to openerp/report/render/rml2txt/__init__.py diff --git a/bin/report/render/rml2txt/rml2txt.py b/openerp/report/render/rml2txt/rml2txt.py similarity index 100% rename from bin/report/render/rml2txt/rml2txt.py rename to openerp/report/render/rml2txt/rml2txt.py diff --git a/bin/report/render/rml2txt/utils.py b/openerp/report/render/rml2txt/utils.py similarity index 98% rename from bin/report/render/rml2txt/utils.py rename to openerp/report/render/rml2txt/utils.py index abbf2dc8426..d967b64c53d 100644 --- a/bin/report/render/rml2txt/utils.py +++ b/openerp/report/render/rml2txt/utils.py @@ -23,7 +23,7 @@ import re import reportlab import reportlab.lib.units from lxml import etree -from tools.safe_eval import safe_eval as eval +from openerp.tools.safe_eval import safe_eval as eval _regex = re.compile('\[\[(.+?)\]\]') diff --git a/bin/report/render/simple.py b/openerp/report/render/simple.py similarity index 100% rename from bin/report/render/simple.py rename to openerp/report/render/simple.py diff --git a/bin/report/report_sxw.py b/openerp/report/report_sxw.py similarity index 99% rename from bin/report/report_sxw.py rename to openerp/report/report_sxw.py index 46633aa545d..1eaf6974c08 100644 --- a/bin/report/report_sxw.py +++ b/openerp/report/report_sxw.py @@ -29,12 +29,12 @@ import time from interface import report_rml import preprocess import logging -import pooler -import tools +import openerp.pooler as pooler +import openerp.tools as tools import zipfile import common -from osv.fields import float as float_class, function as function_class -from osv.orm import browse_record +from openerp.osv.fields import float as float_class, function as function_class +from openerp.osv.orm import browse_record DT_FORMAT = '%Y-%m-%d' DHM_FORMAT = '%Y-%m-%d %H:%M:%S' diff --git a/bin/run_tests.py b/openerp/run_tests.py similarity index 100% rename from bin/run_tests.py rename to openerp/run_tests.py diff --git a/bin/service/__init__.py b/openerp/service/__init__.py similarity index 100% rename from bin/service/__init__.py rename to openerp/service/__init__.py diff --git a/bin/service/http_server.py b/openerp/service/http_server.py similarity index 99% rename from bin/service/http_server.py rename to openerp/service/http_server.py index f40e1df5ba8..a7524186fe2 100644 --- a/bin/service/http_server.py +++ b/openerp/service/http_server.py @@ -31,10 +31,10 @@ """ from websrv_lib import * -import netsvc +import openerp.netsvc as netsvc import errno import threading -import tools +import openerp.tools as tools import posixpath import urllib import os diff --git a/bin/service/netrpc_server.py b/openerp/service/netrpc_server.py similarity index 98% rename from bin/service/netrpc_server.py rename to openerp/service/netrpc_server.py index 9d25c98083a..e3c181d4a8c 100644 --- a/bin/service/netrpc_server.py +++ b/openerp/service/netrpc_server.py @@ -30,9 +30,9 @@ import sys import threading import traceback -import netsvc -import tiny_socket -import tools +import openerp.netsvc as netsvc +import openerp.tiny_socket as tiny_socket +import openerp.tools as tools class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher): def __init__(self, sock, threads): diff --git a/bin/service/security.py b/openerp/service/security.py similarity index 96% rename from bin/service/security.py rename to openerp/service/security.py index 9a9c33984c2..ec13fe3de8c 100644 --- a/bin/service/security.py +++ b/openerp/service/security.py @@ -19,8 +19,8 @@ # ############################################################################## -import pooler -import tools +import openerp.pooler as pooler +import openerp.tools as tools # When rejecting a password, hide the traceback class ExceptionNoTb(Exception): diff --git a/bin/service/web_services.py b/openerp/service/web_services.py similarity index 98% rename from bin/service/web_services.py rename to openerp/service/web_services.py index dcb4fc1feb2..2455d250a94 100644 --- a/bin/service/web_services.py +++ b/openerp/service/web_services.py @@ -27,14 +27,14 @@ import threading import time import sys import platform -from tools.translate import _ -import addons -import ir -import netsvc -import pooler -import release -import sql_db -import tools +from openerp.tools.translate import _ +import openerp.addons as addons +import openerp.ir +import openerp.netsvc as netsvc +import openerp.pooler as pooler +import openerp.release as release +import openerp.sql_db as sql_db +import openerp.tools as tools import locale import logging from cStringIO import StringIO @@ -327,8 +327,8 @@ class db(netsvc.ExportService): def exp_migrate_databases(self,databases): - from osv.orm import except_orm - from osv.osv import except_osv + from openerp.osv.orm import except_orm + from openerp.osv.osv import except_osv l = netsvc.Logger() for db in databases: @@ -441,7 +441,7 @@ GNU Public Licence. return tools.misc.get_server_timezone() def exp_get_available_updates(self, contract_id, contract_password): - import tools.maintenance as tm + import openerp.tools.maintenance as tm try: rc = tm.remote_contract(contract_id, contract_password) if not rc.id: @@ -455,7 +455,7 @@ GNU Public Licence. def exp_get_migration_scripts(self, contract_id, contract_password): l = netsvc.Logger() - import tools.maintenance as tm + import openerp.tools.maintenance as tm try: rc = tm.remote_contract(contract_id, contract_password) if not rc.id: @@ -564,7 +564,6 @@ GNU Public Licence. return res def exp_list_http_services(self): - from service import http_server return http_server.list_http_services() def exp_check_connectivity(self): diff --git a/bin/service/websrv_lib.py b/openerp/service/websrv_lib.py similarity index 100% rename from bin/service/websrv_lib.py rename to openerp/service/websrv_lib.py diff --git a/bin/sql_db.py b/openerp/sql_db.py similarity index 100% rename from bin/sql_db.py rename to openerp/sql_db.py diff --git a/bin/test/__init__.py b/openerp/test/__init__.py similarity index 100% rename from bin/test/__init__.py rename to openerp/test/__init__.py diff --git a/bin/test/test_osv.py b/openerp/test/test_osv.py similarity index 99% rename from bin/test/test_osv.py rename to openerp/test/test_osv.py index 191ca792a2f..48039fa46fa 100644 --- a/bin/test/test_osv.py +++ b/openerp/test/test_osv.py @@ -20,7 +20,7 @@ ############################################################################## import unittest -from osv.query import Query +from openerp.osv.query import Query class QueryTestCase(unittest.TestCase): diff --git a/bin/test/test_translate.py b/openerp/test/test_translate.py similarity index 97% rename from bin/test/test_translate.py rename to openerp/test/test_translate.py index 2e67884409b..85c980bede5 100644 --- a/bin/test/test_translate.py +++ b/openerp/test/test_translate.py @@ -20,7 +20,7 @@ ############################################################################## import unittest -from tools.translate import quote, unquote +from openerp.tools.translate import quote, unquote class TranslationToolsTestCase(unittest.TestCase): diff --git a/bin/tiny_socket.py b/openerp/tiny_socket.py similarity index 100% rename from bin/tiny_socket.py rename to openerp/tiny_socket.py diff --git a/bin/tools/__init__.py b/openerp/tools/__init__.py similarity index 98% rename from bin/tools/__init__.py rename to openerp/tools/__init__.py index f1a0faf0f8f..16042841b6e 100644 --- a/bin/tools/__init__.py +++ b/openerp/tools/__init__.py @@ -21,7 +21,7 @@ import copy import win32 -from config import * +from config import config from misc import * from convert import * from translate import * diff --git a/bin/tools/amount_to_text.py b/openerp/tools/amount_to_text.py similarity index 100% rename from bin/tools/amount_to_text.py rename to openerp/tools/amount_to_text.py diff --git a/bin/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py similarity index 95% rename from bin/tools/amount_to_text_en.py rename to openerp/tools/amount_to_text_en.py index 66d749e5fb3..77d18cbb55d 100644 --- a/bin/tools/amount_to_text_en.py +++ b/openerp/tools/amount_to_text_en.py @@ -22,7 +22,7 @@ #------------------------------------------------------------- #ENGLISH #------------------------------------------------------------- -from tools.translate import _ +from translate import _ to_19 = ( 'Zero', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten', 'Eleven', 'Twelve', 'Thirteen', @@ -99,13 +99,13 @@ def amount_to_text(nbr, lang='en', currency='euro'): Example: 1654: thousands six cent cinquante-quatre. """ - import netsvc + import openerp.loglevels as loglevels # if nbr > 10000000: # netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("Number too large '%d', can not translate it")) # return str(nbr) if not _translate_funcs.has_key(lang): - netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("no translation function found for lang: '%s'" % (lang,))) + loglevels.Logger().notifyChannel('translate', loglevels.LOG_WARNING, _("no translation function found for lang: '%s'" % (lang,))) #TODO: (default should be en) same as above lang = 'en' return _translate_funcs[lang](abs(nbr), currency) diff --git a/bin/tools/config.py b/openerp/tools/config.py similarity index 98% rename from bin/tools/config.py rename to openerp/tools/config.py index bc9229e0b72..3a3fb4575cd 100644 --- a/bin/tools/config.py +++ b/openerp/tools/config.py @@ -23,9 +23,10 @@ import ConfigParser import optparse import os import sys -import netsvc +import openerp +import openerp.loglevels as loglevels import logging -import release +import openerp.release as release def check_ssl(): try: @@ -102,7 +103,7 @@ class configmanager(object): self.config_file = fname self.has_ssl = check_ssl() - self._LOGLEVELS = dict([(getattr(netsvc, 'LOG_%s' % x), getattr(logging, x)) + self._LOGLEVELS = dict([(getattr(loglevels, 'LOG_%s' % x), getattr(logging, x)) for x in ('CRITICAL', 'ERROR', 'WARNING', 'INFO', 'TEST', 'DEBUG', 'DEBUG_RPC', 'DEBUG_SQL', 'DEBUG_RPC_ANSWER','NOTSET')]) version = "%s %s" % (release.description, release.version) @@ -316,7 +317,7 @@ class configmanager(object): self.options['log_level'] = self._LOGLEVELS.get(self.options['log_level']) or int(self.options['log_level']) if not self.options['root_path'] or self.options['root_path']=='None': - self.options['root_path'] = os.path.abspath(os.path.dirname(sys.argv[0])) + self.options['root_path'] = os.path.dirname(openerp.__file__) if not self.options['addons_path'] or self.options['addons_path']=='None': self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons') @@ -496,8 +497,3 @@ class configmanager(object): config = configmanager() -# FIXME:following line should be called explicitly by the server -# when it starts, to allow doing 'import tools.config' from -# other python executables without parsing *their* args. -config.parse_config() - diff --git a/bin/tools/convert.py b/openerp/tools/convert.py similarity index 98% rename from bin/tools/convert.py rename to openerp/tools/convert.py index db8d71843ba..6f91a955cc6 100644 --- a/bin/tools/convert.py +++ b/openerp/tools/convert.py @@ -28,7 +28,7 @@ import re # for eval context: import time -import release +import openerp.release as release try: import pytz except: @@ -41,21 +41,20 @@ except: from datetime import datetime, timedelta from lxml import etree import misc -import netsvc -import osv -import pooler +import openerp.loglevels as loglevels +import openerp.pooler as pooler from config import config -from tools.translate import _ +from translate import _ from yaml_import import convert_yaml_import # List of etree._Element subclasses that we choose to ignore when parsing XML. -from tools import SKIPPED_ELEMENT_TYPES +from misc import SKIPPED_ELEMENT_TYPES # Import of XML records requires the unsafe eval as well, # almost everywhere, which is ok because it supposedly comes # from trusted data, but at least we make it obvious now. unsafe_eval = eval -from tools.safe_eval import safe_eval as eval +from safe_eval import safe_eval as eval class ConvertError(Exception): def __init__(self, doc, orig_excpt): @@ -541,6 +540,7 @@ form: module.record_id""" % (xml_id,) id = _eval_xml(self, rec[0], self.pool, cr, self.uid, self.idref) uid = self.get_uid(cr, self.uid, data_node, rec) + import openerp.netsvc as netsvc wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, model, id, @@ -688,7 +688,7 @@ form: module.record_id""" % (xml_id,) rec_src = rec.get("search",'').encode('utf8') rec_src_count = rec.get("count") - severity = rec.get("severity",'').encode('ascii') or netsvc.LOG_ERROR + severity = rec.get("severity",'').encode('ascii') or loglevels.LOG_ERROR rec_string = rec.get("string",'').encode('utf8') or 'unknown' ids = None @@ -825,6 +825,7 @@ form: module.record_id""" % (xml_id,) else: f_val = _eval_xml(self,field, self.pool, cr, self.uid, self.idref) if model._columns.has_key(f_name): + import openerp.osv as osv if isinstance(model._columns[f_name], osv.fields.integer): f_val = int(f_val) res[f_name] = f_val @@ -964,9 +965,9 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa try: relaxng.assert_(doc) except Exception: - logger = netsvc.Logger() - logger.notifyChannel('init', netsvc.LOG_ERROR, 'The XML file does not fit the required schema !') - logger.notifyChannel('init', netsvc.LOG_ERROR, misc.ustr(relaxng.error_log.last_error)) + logger = loglevels.Logger() + logger.notifyChannel('init', loglevels.LOG_ERROR, 'The XML file does not fit the required schema !') + logger.notifyChannel('init', loglevels.LOG_ERROR, misc.ustr(relaxng.error_log.last_error)) raise if idref is None: diff --git a/bin/tools/copy.py b/openerp/tools/copy.py similarity index 100% rename from bin/tools/copy.py rename to openerp/tools/copy.py diff --git a/bin/tools/func.py b/openerp/tools/func.py similarity index 100% rename from bin/tools/func.py rename to openerp/tools/func.py diff --git a/bin/tools/graph.py b/openerp/tools/graph.py similarity index 100% rename from bin/tools/graph.py rename to openerp/tools/graph.py diff --git a/bin/tools/import_email.py b/openerp/tools/import_email.py similarity index 100% rename from bin/tools/import_email.py rename to openerp/tools/import_email.py diff --git a/bin/tools/lru.py b/openerp/tools/lru.py similarity index 100% rename from bin/tools/lru.py rename to openerp/tools/lru.py diff --git a/bin/tools/misc.py b/openerp/tools/misc.py similarity index 98% rename from bin/tools/misc.py rename to openerp/tools/misc.py index 615893ef238..e3ea8441412 100644 --- a/bin/tools/misc.py +++ b/openerp/tools/misc.py @@ -55,7 +55,7 @@ try: except ImportError: html2text = None -import netsvc +import openerp.loglevels as loglevels from config import config from lru import LRU @@ -67,7 +67,7 @@ SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.Com # initialize a database with base/base.sql def init_db(cr): - import addons + import openerp.addons as addons f = addons.get_module_resource('base', 'base.sql') base_sql_file = file_open(f) try: @@ -200,7 +200,7 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False): @return: fileobject if pathinfo is False else (fileobject, filepath) """ - import addons + import openerp.addons as addons adps = addons.ad_paths rtp = os.path.normcase(os.path.abspath(config['root_path'])) @@ -434,10 +434,10 @@ def _email_send(smtp_from, smtp_to_list, message, openobject_id=None, ssl=False, """ class WriteToLogger(object): def __init__(self): - self.logger = netsvc.Logger() + self.logger = loglevels.Logger() def write(self, s): - self.logger.notifyChannel('email_send', netsvc.LOG_DEBUG, s) + self.logger.notifyChannel('email_send', loglevels.LOG_DEBUG, s) if openobject_id: message['Message-Id'] = generate_tracking_message_id(openobject_id) @@ -1077,7 +1077,7 @@ def human_size(sz): return "%0.2f %s" % (s, units[i]) def logged(f): - from tools.func import wraps + from func import wraps @wraps(f) def wrapper(*args, **kwargs): @@ -1094,7 +1094,7 @@ def logged(f): vector.append(' result: %s' % pformat(res)) vector.append(' time delta: %s' % (time.time() - timeb4)) - netsvc.Logger().notifyChannel('logged', netsvc.LOG_DEBUG, '\n'.join(vector)) + loglevels.Logger().notifyChannel('logged', loglevels.LOG_DEBUG, '\n'.join(vector)) return res return wrapper @@ -1104,7 +1104,7 @@ class profile(object): self.fname = fname def __call__(self, f): - from tools.func import wraps + from func import wraps @wraps(f) def wrapper(*args, **kwargs): @@ -1300,7 +1300,7 @@ def detect_server_timezone(): try: import pytz except Exception: - netsvc.Logger().notifyChannel("detect_server_timezone", netsvc.LOG_WARNING, + loglevels.Logger().notifyChannel("detect_server_timezone", loglevels.LOG_WARNING, "Python pytz module is not available. Timezone will be set to UTC by default.") return 'UTC' @@ -1334,14 +1334,14 @@ def detect_server_timezone(): if value: try: tz = pytz.timezone(value) - netsvc.Logger().notifyChannel("detect_server_timezone", netsvc.LOG_INFO, + loglevels.Logger().notifyChannel("detect_server_timezone", loglevels.LOG_INFO, "Using timezone %s obtained from %s." % (tz.zone,source)) return value except pytz.UnknownTimeZoneError: - netsvc.Logger().notifyChannel("detect_server_timezone", netsvc.LOG_WARNING, + loglevels.Logger().notifyChannel("detect_server_timezone", loglevels.LOG_WARNING, "The timezone specified in %s (%s) is invalid, ignoring it." % (source,value)) - netsvc.Logger().notifyChannel("detect_server_timezone", netsvc.LOG_WARNING, + loglevels.Logger().notifyChannel("detect_server_timezone", loglevels.LOG_WARNING, "No valid timezone could be detected, using default UTC timezone. You can specify it explicitly with option 'timezone' in the server configuration.") return 'UTC' diff --git a/bin/tools/osutil.py b/openerp/tools/osutil.py similarity index 100% rename from bin/tools/osutil.py rename to openerp/tools/osutil.py diff --git a/bin/tools/parse_version.py b/openerp/tools/parse_version.py similarity index 100% rename from bin/tools/parse_version.py rename to openerp/tools/parse_version.py diff --git a/bin/tools/pdf_utils.py b/openerp/tools/pdf_utils.py similarity index 100% rename from bin/tools/pdf_utils.py rename to openerp/tools/pdf_utils.py diff --git a/bin/tools/safe_eval.py b/openerp/tools/safe_eval.py similarity index 100% rename from bin/tools/safe_eval.py rename to openerp/tools/safe_eval.py diff --git a/bin/tools/sql.py b/openerp/tools/sql.py similarity index 100% rename from bin/tools/sql.py rename to openerp/tools/sql.py diff --git a/bin/tools/test_reports.py b/openerp/tools/test_reports.py similarity index 98% rename from bin/tools/test_reports.py rename to openerp/tools/test_reports.py index 6e4b08ece2c..88430dffc5c 100644 --- a/bin/tools/test_reports.py +++ b/openerp/tools/test_reports.py @@ -25,11 +25,11 @@ through the code of yaml tests. """ -import netsvc -import tools +import openerp.netsvc as netsvc +import openerp.tools as tools import logging -import pooler -from tools.safe_eval import safe_eval +import openerp.pooler as pooler +from openerp.tools.safe_eval import safe_eval from subprocess import Popen, PIPE import os import tempfile diff --git a/bin/tools/threadinglocal.py b/openerp/tools/threadinglocal.py similarity index 100% rename from bin/tools/threadinglocal.py rename to openerp/tools/threadinglocal.py diff --git a/bin/tools/translate.py b/openerp/tools/translate.py similarity index 97% rename from bin/tools/translate.py rename to openerp/tools/translate.py index 510ae71ab1f..73b9378246f 100644 --- a/bin/tools/translate.py +++ b/openerp/tools/translate.py @@ -26,7 +26,7 @@ import inspect import itertools import locale import os -import pooler +import openerp.pooler as pooler import re import logging import tarfile @@ -37,10 +37,9 @@ from os.path import join from datetime import datetime from lxml import etree -import tools -import netsvc -from tools.misc import UpdateableStr -from tools.misc import SKIPPED_ELEMENT_TYPES +import misc +from misc import UpdateableStr +from misc import SKIPPED_ELEMENT_TYPES _LOCALE2WIN32 = { 'af_ZA': 'Afrikaans_South Africa', @@ -353,7 +352,7 @@ class TinyPoFile(object): return type, name, res_id, source, trad def write_infos(self, modules): - import release + import openerp.release as release self.buffer.write("# Translation of %(project)s.\n" \ "# This file contains the translation of the following modules:\n" \ "%(modules)s" \ @@ -418,7 +417,7 @@ def trans_export(lang, modules, buffer, format, cr): writer.writerow(row) elif format == 'po': rows.pop(0) - writer = tools.TinyPoFile(buffer) + writer = TinyPoFile(buffer) writer.write_infos(modules) # we now group the translations by source. That means one translation per source. @@ -587,6 +586,7 @@ def trans_generate(lang, modules, cr): push_translation(module, 'view', encode(obj.model), 0, t) elif model=='ir.actions.wizard': service_name = 'wizard.'+encode(obj.wiz_name) + import openerp.netsvc as netsvc if netsvc.Service._services.get(service_name): obj2 = netsvc.Service._services[service_name] for state_name, state_def in obj2.states.iteritems(): @@ -677,7 +677,7 @@ def trans_generate(lang, modules, cr): report_type = "xsl" if fname and obj.report_type in ('pdf', 'xsl'): try: - report_file = tools.file_open(fname) + report_file = misc.file_open(fname) try: d = etree.parse(report_file) for t in parse_func(d.iter()): @@ -726,8 +726,8 @@ def trans_generate(lang, modules, cr): def get_module_from_path(path, mod_paths=None): if not mod_paths: # First, construct a list of possible paths - def_path = os.path.abspath(os.path.join(tools.config['root_path'], 'addons')) # default addons path (base) - ad_paths= map(lambda m: os.path.abspath(m.strip()),tools.config['addons_path'].split(',')) + def_path = os.path.abspath(os.path.join(config.config['root_path'], 'addons')) # default addons path (base) + ad_paths= map(lambda m: os.path.abspath(m.strip()),config.config['addons_path'].split(',')) mod_paths=[def_path] for adp in ad_paths: mod_paths.append(adp) @@ -745,9 +745,9 @@ def trans_generate(lang, modules, cr): installed_modids = modobj.search(cr, uid, [('state', '=', 'installed')]) installed_modules = map(lambda m: m['name'], modobj.read(cr, uid, installed_modids, ['name'])) - root_path = os.path.join(tools.config['root_path'], 'addons') + root_path = os.path.join(config.config['root_path'], 'addons') - apaths = map(os.path.abspath, map(str.strip, tools.config['addons_path'].split(','))) + apaths = map(os.path.abspath, map(str.strip, config.config['addons_path'].split(','))) if root_path in apaths: path_list = apaths else : @@ -755,7 +755,7 @@ def trans_generate(lang, modules, cr): # Also scan these non-addon paths for bin_path in ['osv', 'report' ]: - path_list.append(os.path.join(tools.config['root_path'], bin_path)) + path_list.append(os.path.join(config.config['root_path'], bin_path)) logger.debug("Scanning modules at paths: ", path_list) @@ -772,7 +772,7 @@ def trans_generate(lang, modules, cr): is_mod_installed = module in installed_modules if (('all' in modules) or (module in modules)) and is_mod_installed: logger.debug("Scanning code of %s at module: %s", frelativepath, module) - src_file = tools.file_open(fabsolutepath, subdir='') + src_file = misc.file_open(fabsolutepath, subdir='') try: code_string = src_file.read() finally: @@ -816,7 +816,7 @@ def trans_generate(lang, modules, cr): for path in path_list: logger.debug("Scanning files of modules at %s", path) - for root, dummy, files in tools.osutil.walksymlinks(path): + for root, dummy, files in osutil.walksymlinks(path): for fname in itertools.chain(fnmatch.filter(files, '*.py')): export_code_terms_from_file(fname, path, root, 'code') for fname in itertools.chain(fnmatch.filter(files, '*.mako')): @@ -860,7 +860,7 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, lang_obj = pool.get('res.lang') trans_obj = pool.get('ir.translation') model_data_obj = pool.get('ir.model.data') - iso_lang = tools.get_iso_codes(lang) + iso_lang = misc.get_iso_codes(lang) try: uid = 1 ids = lang_obj.search(cr, uid, [('code','=', lang)]) diff --git a/bin/tools/which.py b/openerp/tools/which.py similarity index 100% rename from bin/tools/which.py rename to openerp/tools/which.py diff --git a/bin/tools/win32.py b/openerp/tools/win32.py similarity index 100% rename from bin/tools/win32.py rename to openerp/tools/win32.py diff --git a/bin/tools/yaml_import.py b/openerp/tools/yaml_import.py similarity index 99% rename from bin/tools/yaml_import.py rename to openerp/tools/yaml_import.py index 2b5c982ca7b..a5052f68aed 100644 --- a/bin/tools/yaml_import.py +++ b/openerp/tools/yaml_import.py @@ -4,8 +4,7 @@ import time # used to eval time.strftime expressions from datetime import datetime, timedelta import logging -import pooler -import netsvc +import openerp.pooler as pooler import misc from config import config import yaml_tag @@ -14,7 +13,7 @@ import yaml # YAML import needs both safe and unsafe eval, but let's # default to /safe/. unsafe_eval = eval -from tools.safe_eval import safe_eval as eval +from safe_eval import safe_eval as eval logger_channel = 'tests' @@ -297,7 +296,7 @@ class YamlInterpreter(object): return record_dict def process_record(self, node): - import osv + import openerp.osv as osv record, fields = node.items()[0] model = self.get_model(record.model) if isinstance(model, osv.osv.osv_memory): @@ -448,6 +447,7 @@ class YamlInterpreter(object): signals=[x['signal'] for x in self.cr.dictfetchall()] if workflow.action not in signals: raise YamlImportException('Incorrect action %s. No such action defined' % workflow.action) + import openerp.netsvc as netsvc wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr) diff --git a/bin/tools/yaml_tag.py b/openerp/tools/yaml_tag.py similarity index 100% rename from bin/tools/yaml_tag.py rename to openerp/tools/yaml_tag.py diff --git a/bin/wizard/__init__.py b/openerp/wizard/__init__.py similarity index 95% rename from bin/wizard/__init__.py rename to openerp/wizard/__init__.py index 7302f4d4348..ea7ee713be4 100644 --- a/bin/wizard/__init__.py +++ b/openerp/wizard/__init__.py @@ -19,18 +19,18 @@ # ############################################################################## -import netsvc -from tools import copy -from tools.misc import UpdateableStr, UpdateableDict -from tools.translate import translate +import openerp.netsvc as netsvc +from openerp.tools import copy +from openerp.tools.misc import UpdateableStr, UpdateableDict +from openerp.tools.translate import translate from lxml import etree -import ir -import pooler +import openerp.ir as ir +import openerp.pooler as pooler -from osv.osv import except_osv -from osv.orm import except_orm -from netsvc import Logger, LOG_ERROR +from openerp.osv.osv import except_osv +from openerp.osv.orm import except_orm +from openerp.netsvc import Logger, LOG_ERROR import sys class except_wizard(Exception): diff --git a/bin/workflow/__init__.py b/openerp/workflow/__init__.py similarity index 100% rename from bin/workflow/__init__.py rename to openerp/workflow/__init__.py diff --git a/bin/workflow/common.py b/openerp/workflow/common.py similarity index 100% rename from bin/workflow/common.py rename to openerp/workflow/common.py diff --git a/bin/workflow/instance.py b/openerp/workflow/instance.py similarity index 98% rename from bin/workflow/instance.py rename to openerp/workflow/instance.py index e530d56dcd2..298548288f5 100644 --- a/bin/workflow/instance.py +++ b/openerp/workflow/instance.py @@ -22,8 +22,8 @@ import wkf_logs import workitem -import netsvc -import pooler +import openerp.netsvc as netsvc +import openerp.pooler as pooler def create(cr, ident, wkf_id): (uid,res_type,res_id) = ident diff --git a/bin/workflow/wkf_expr.py b/openerp/workflow/wkf_expr.py similarity index 95% rename from bin/workflow/wkf_expr.py rename to openerp/workflow/wkf_expr.py index 71a15a181f9..468e5225212 100644 --- a/bin/workflow/wkf_expr.py +++ b/openerp/workflow/wkf_expr.py @@ -20,10 +20,10 @@ ############################################################################## import sys -import netsvc -import osv as base -import pooler -from tools.safe_eval import safe_eval as eval +import openerp.netsvc as netsvc +import openerp.osv as base +import openerp.pooler as pooler +from openerp.tools.safe_eval import safe_eval as eval class Env(dict): def __init__(self, cr, uid, model, ids): diff --git a/bin/workflow/wkf_logs.py b/openerp/workflow/wkf_logs.py similarity index 97% rename from bin/workflow/wkf_logs.py rename to openerp/workflow/wkf_logs.py index 225f84e86c0..a19945bdc0b 100644 --- a/bin/workflow/wkf_logs.py +++ b/openerp/workflow/wkf_logs.py @@ -22,7 +22,7 @@ # # May be uncommented to logs workflows modifications # -import netsvc +import openerp.netsvc as netsvc def log(cr,ident,act_id,info=''): return diff --git a/bin/workflow/wkf_service.py b/openerp/workflow/wkf_service.py similarity index 98% rename from bin/workflow/wkf_service.py rename to openerp/workflow/wkf_service.py index 1861fef2913..6f5059e6817 100644 --- a/bin/workflow/wkf_service.py +++ b/openerp/workflow/wkf_service.py @@ -23,8 +23,8 @@ import wkf_logs import workitem import instance -import netsvc -import pooler +import openerp.netsvc as netsvc +import openerp.pooler as pooler class workflow_service(netsvc.Service): def __init__(self, name='workflow', audience='*'): diff --git a/bin/workflow/workitem.py b/openerp/workflow/workitem.py similarity index 99% rename from bin/workflow/workitem.py rename to openerp/workflow/workitem.py index bd98e8f67a1..c022684af7c 100644 --- a/bin/workflow/workitem.py +++ b/openerp/workflow/workitem.py @@ -24,7 +24,7 @@ # cr.execute('delete from wkf_triggers where model=%s and res_id=%s', (res_type,res_id)) # -import netsvc +import openerp.netsvc as netsvc import instance import wkf_expr