[FIX] document_webdav: fix mistaken imports

bzr revid: rco@openerp.com-20121218083202-a11ujcvtqngx8vgz

addons/document_webdav/dav_fs.py

@@ -22,10 +22,9 @@ import os
 import time
 import errno
 import re
-
-import openerp
-from openerp import pooler, sql_db, netsvc
 import urlparse
+import urllib
+
 try:
     from pywebdav.lib.constants import COLLECTION  # , OBJECT
     from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
@@ -37,18 +36,14 @@ except ImportError:
     from DAV.iface import dav_interface
     from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 
-import urllib
-
+import openerp
+from openerp import pooler, sql_db, netsvc
 from openerp.tools import misc
-from openerp.tools.cache import memoize
+from openerp.addons.document.dict_tools import dict_merge2
 
+from cache import memoize
 from webdav import mk_lock_response
 
-try:
-    from tools.dict_tools import dict_merge2
-except ImportError:
-    from document.dict_tools import dict_merge2
-
 CACHE_SIZE=20000
 
 #hack for urlparse: add webdav in the net protocols

addons/document_webdav/document_webdav.py

@@ -20,9 +20,10 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-import nodes
 from openerp.tools import config
 
+import nodes
+
 class document_davdir(osv.osv):
     _inherit = 'document.directory'