[IMP]document: remove warning

bzr revid: kjo@tinyerp.com-20120614060450-w8771020su128gmg

3 files changed, 9 insertions, 13 deletions

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index d09d2cc86d5..9cc750b7c12 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -78,9 +78,8 @@ class document_directory(osv.osv):
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             return root_id
         except Exception, e:
-            import netsvc
-            logger = netsvc.Logger()
-            logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
+            import logging
+            logging.getLogger('document').warning('Cannot set directory root:'+ str(e))
             return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 2e09a938a05..c9f735cdd9e 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -23,7 +23,7 @@ import threading
 import ftpserver
 import authorizer
 import abstracted_fs
-import netsvc
+import logging
 from tools import config
 
 def start_server():
@@ -35,9 +35,6 @@ def start_server():
         PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
     class ftp_server(threading.Thread):
-        def log(self, level, message):
-            logger = netsvc.Logger()
-            logger.notifyChannel('FTP', level, message)
 
         def run(self):
             autho = authorizer.authorizer()
@@ -48,17 +45,17 @@ def start_server():
             if PASSIVE_PORTS:
                 ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-            ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+            ftpserver.log = lambda msg: logging.getLogger('document.ftp').info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+            ftpserver.logerror = lambda msg: logging.getLogger('document.ftp').error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()
 
     if HOST.lower() == 'none':
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+        logging.getLogger('document.ftp').info("\n Server FTP Not Started\n")
     else:
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        logging.getLogger('document.ftp').info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
         ds = ftp_server()
         ds.daemon = True
         ds.start()
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index b0101c01574..a5935f42af4 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -77,7 +77,7 @@
         <field name="inherit_id" ref="document.view_document_directory_form" />
         <field name="type">form</field>
         <field name="arch" type="xml">
-        <page string="Dynamic context" position="after" version="7.0">
+        <xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
         <page string="WebDAV properties">
             <label string="These properties will be added to WebDAV requests" colspan="4" />
 
@@ -97,7 +97,7 @@
                 </form>
             </field>
         </page>
-        </page>
+        </xpath>
     </field>
     </record>