← Back to branch summary

~tempo-openerp/openobject-server/keep_order_read-6.0

« back to all changes in this revision

Viewing changes to openerp/pooler.py

  • Committer: Vo Minh Thu
  • Date: 2011-02-08 15:01:49 UTC
  • mfrom: (3346.1.6 server-lib)
  • Revision ID: vmt@openerp.com-20110208150149-x4vu09aj42ezma5a
[MERGE] merge of the openerp python module branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/pooler.py
30
30
    if db_name in pool_dic:
31
31
        pool = pool_dic[db_name]
32
32
    else:
33
 
        import addons
34
 
        import osv.osv
35
 
        pool = osv.osv.osv_pool()
 
33
        import openerp.addons as addons
 
34
        import openerp.osv.osv as osv_osv
 
35
        pool = osv_osv.osv_pool()
36
36
        pool_dic[db_name] = pool
37
37
 
38
38
        try:
66
66
    # sql_db must not be loaded before the logger is initialized.
67
67
    # sql_db import psycopg2.tool which create a default logger if there is not.
68
68
    # this resulting of having the logs outputed twice...
69
 
    import sql_db
 
69
    import openerp.sql_db as sql_db
70
70
    db = sql_db.db_connect(db_name)
71
71
    return db
72
72