[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)

bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx

1 files changed, 6 insertions, 6 deletions

diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index a4b37b126b2..48f623120a9 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -20,21 +20,21 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import fields, osv
 import os
-import tools
+from openerp import tools
 import base64
 import errno
 import logging
 import shutil
 from StringIO import StringIO
 import psycopg2
-from tools.misc import ustr
-from tools.translate import _
-from osv.orm import except_orm
+from openerp.tools.misc import ustr
+from openerp.tools.translate import _
+from openerp.osv.orm import except_orm
 import random
 import string
-import pooler
+from openerp import pooler
 import nodes
 from content_index import cntIndex
 _logger = logging.getLogger(__name__)