[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy

3 files changed, 46 insertions, 45 deletions

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 0c2e52c8df7..88f855f75f0 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -62,7 +62,7 @@ class openerp_dav_handler(dav_interface):
         self.baseuri = parent.baseuri
         self.verbose = verbose
 
-    def get_propnames(self,uri):
+    def get_propnames(self, uri):
         props = self.PROPS   
         self.parent.log_message('get propnames: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
@@ -104,7 +104,7 @@ class openerp_dav_handler(dav_interface):
             pname        -- name of the property
          """            
         if self.M_NS.has_key(ns):
-           return dav_interface.get_prop(self,uri,ns,propname) 
+           return dav_interface.get_prop(self, uri, ns, propname) 
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
@@ -114,7 +114,7 @@ class openerp_dav_handler(dav_interface):
         if not node:
             cr.close()
             raise DAV_NotFound
-        res = node.get_dav_eprop(cr,ns,propname)        
+        res = node.get_dav_eprop(cr, ns, propname)        
         cr.close()        
         return res    
 
@@ -149,7 +149,7 @@ class openerp_dav_handler(dav_interface):
             cr.close()
         return self.db_name_list
 
-    def get_childs(self,uri, filters=None):
+    def get_childs(self, uri, filters=None):
         """ return the child objects as self.baseuris for the given URI """        
         self.parent.log_message('get childs: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
@@ -160,7 +160,7 @@ class openerp_dav_handler(dav_interface):
             res = map(lambda x: self.urijoin(x), self.db_list())            
             return res
         result = []
-        node = self.uri2object(cr,uid,pool, uri2[:])
+        node = self.uri2object(cr, uid, pool, uri2[:])
         
         if not node:
             if cr: cr.close()
@@ -218,7 +218,7 @@ class openerp_dav_handler(dav_interface):
         uri2 = reluri.split('/')[2:]        
         return cr, uid, pool, dbname, uri2
 
-    def uri2object(self, cr,uid, pool,uri):
+    def uri2object(self, cr, uid, pool,uri):
         if not uid:
             return None
         return pool.get('document.directory').get_object(cr, uid, uri)
@@ -230,7 +230,7 @@ class openerp_dav_handler(dav_interface):
         try:
             if not dbname:
                 raise DAV_Error, 409
-            node = self.uri2object(cr,uid,pool, uri2)   
+            node = self.uri2object(cr, uid, pool, uri2)   
             if not node:
                 raise DAV_NotFound(uri2)
             try:
@@ -277,7 +277,7 @@ class openerp_dav_handler(dav_interface):
         if not dbname:
             cr.close()
             return COLLECTION
-        node = self.uri2object(cr,uid,pool, uri2)
+        node = self.uri2object(cr, uid, pool, uri2)
         if not node:
             cr.close()
             raise DAV_NotFound(uri2)
@@ -285,7 +285,7 @@ class openerp_dav_handler(dav_interface):
         return node.displayname
 
     @memoize(CACHE_SIZE)
-    def _get_dav_getcontentlength(self,uri):
+    def _get_dav_getcontentlength(self, uri):
         """ return the content length of an object """        
         self.parent.log_message('get length: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
@@ -321,7 +321,7 @@ class openerp_dav_handler(dav_interface):
         return str(result)
 
     @memoize(CACHE_SIZE)
-    def get_lastmodified(self,uri):
+    def get_lastmodified(self, uri):
         """ return the last modified date of the object """
         if uri[-1]=='/':uri=uri[:-1]
         today = time.time()
@@ -329,7 +329,7 @@ class openerp_dav_handler(dav_interface):
         if not dbname:
             return today
         try:            
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
             if node.write_date:
@@ -340,14 +340,14 @@ class openerp_dav_handler(dav_interface):
             if cr: cr.close()
 
     @memoize(CACHE_SIZE)
-    def get_creationdate(self,uri):
+    def get_creationdate(self, uri):
         """ return the last modified date of the object """        
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             raise DAV_Error, 409
         try:            
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)            
             if node.create_date:
@@ -366,7 +366,7 @@ class openerp_dav_handler(dav_interface):
         if not dbname:
             return 'httpd/unix-directory'
         try:            
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
             result = node.mimetype
@@ -393,7 +393,7 @@ class openerp_dav_handler(dav_interface):
         cr.close()
         return True
 
-    def put(self,uri,data,content_type=None):
+    def put(self, uri, data, content_type=None):
         """ put the object into the filesystem """
         self.parent.log_message('Putting %s (%d), %s'%( misc.ustr(uri), data and len(data) or 0, content_type))
         parent='/'.join(uri.split('/')[:-1])
@@ -401,7 +401,7 @@ class openerp_dav_handler(dav_interface):
         if not dbname:
             raise DAV_Forbidden
         try:
-            node = self.uri2object(cr,uid,pool, uri2[:])
+            node = self.uri2object(cr, uid, pool, uri2[:])
         except:
             node = False
         
@@ -409,11 +409,11 @@ class openerp_dav_handler(dav_interface):
         ext = objname.find('.') >0 and objname.split('.')[1] or False
 
         if not node:
-            dir_node = self.uri2object(cr,uid,pool, uri2[:-1])
+            dir_node = self.uri2object(cr, uid, pool, uri2[:-1])
             if not dir_node:
                 raise DAV_NotFound('Parent folder not found')
             try:
-                dir_node.create_child(cr,objname,data)
+                dir_node.create_child(cr, objname, data)
             except Exception,e:
                 import traceback
                 self.parent.log_error("Cannot create %s: %s", objname, str(e))
@@ -421,7 +421,7 @@ class openerp_dav_handler(dav_interface):
                 raise DAV_Forbidden
         else:
             try:
-                node.set_data(cr,data)
+                node.set_data(cr, data)
             except Exception,e:
                 import traceback
                 self.parent.log_error("Cannot save %s: %s", objname, str(e))
@@ -433,7 +433,6 @@ class openerp_dav_handler(dav_interface):
         return 201
 
     def rmcol(self,uri):
-        print ' REMOVE COLLL :::::', uri
         """ delete a collection """
         if uri[-1]=='/':uri=uri[:-1]
 
@@ -448,13 +447,12 @@ class openerp_dav_handler(dav_interface):
         return 204
 
     def rm(self,uri):
-        print ' REMOVE EVENT :::::', uri
         if uri[-1]=='/':uri=uri[:-1]        
         cr, uid, pool,dbname, uri2 = self.get_cr(uri)
         if not dbname:        
             cr.close()
             raise DAV_Error, 409
-        node = self.uri2object(cr,uid,pool, uri2)
+        node = self.uri2object(cr, uid, pool, uri2)
         res = node.rm(cr)
         if not res:
             raise OSError(1, 'Operation not permited.')        
@@ -467,7 +465,7 @@ class openerp_dav_handler(dav_interface):
     ### a rm directly
     ###
 
-    def delone(self,uri):
+    def delone(self, uri):
         """ delete a single resource
 
         You have to return a result dict of the form
@@ -480,7 +478,7 @@ class openerp_dav_handler(dav_interface):
         parent='/'.join(uri.split('/')[:-1])
         return res
 
-    def deltree(self,uri):
+    def deltree(self, uri):
         """ delete a collection
 
         You have to return a result dict of the form
@@ -488,7 +486,7 @@ class openerp_dav_handler(dav_interface):
         or None if everything's ok
         """
         if uri[-1]=='/':uri=uri[:-1]
-        res=deltree(self,uri)
+        res=deltree(self, uri)
         parent='/'.join(uri.split('/')[:-1])
         return res
 
@@ -497,7 +495,7 @@ class openerp_dav_handler(dav_interface):
     ### MOVE handlers (examples)
     ###
 
-    def moveone(self,src,dst,overwrite):
+    def moveone(self, src, dst, overwrite):
         """ move one resource with Depth=0
 
         an alternative implementation would be
@@ -514,10 +512,10 @@ class openerp_dav_handler(dav_interface):
         (untested!). This would not use the davcmd functions
         and thus can only detect errors directly on the root node.
         """
-        res=moveone(self,src,dst,overwrite)
+        res=moveone(self, src, dst, overwrite)
         return res
 
-    def movetree(self,src,dst,overwrite):
+    def movetree(self, src, dst, overwrite):
         """ move a collection with Depth=infinity
 
         an alternative implementation would be
@@ -534,14 +532,14 @@ class openerp_dav_handler(dav_interface):
         (untested!). This would not use the davcmd functions
         and thus can only detect errors directly on the root node"""
 
-        res=movetree(self,src,dst,overwrite)
+        res=movetree(self, src, dst, overwrite)
         return res
 
     ###
     ### COPY handlers
     ###
 
-    def copyone(self,src,dst,overwrite):
+    def copyone(self, src, dst, overwrite):
         """ copy one resource with Depth=0
 
         an alternative implementation would be
@@ -558,10 +556,10 @@ class openerp_dav_handler(dav_interface):
         (untested!). This would not use the davcmd functions
         and thus can only detect errors directly on the root node.
         """
-        res=copyone(self,src,dst,overwrite)
+        res=copyone(self, src, dst, overwrite)
         return res
 
-    def copytree(self,src,dst,overwrite):
+    def copytree(self, src, dst, overwrite):
         """ copy a collection with Depth=infinity
 
         an alternative implementation would be
@@ -577,7 +575,7 @@ class openerp_dav_handler(dav_interface):
 
         (untested!). This would not use the davcmd functions
         and thus can only detect errors directly on the root node"""
-        res=copytree(self,src,dst,overwrite)
+        res=copytree(self, src, dst, overwrite)
         return res
 
     ###
@@ -588,15 +586,15 @@ class openerp_dav_handler(dav_interface):
     ### Look in davcmd.py for further details.
     ###
 
-    def copy(self,src,dst):
+    def copy(self, src, dst):
         src=urllib.unquote(src)
         dst=urllib.unquote(dst)
         ct = self._get_dav_getcontenttype(src)
         data = self.get_data(src)
-        self.put(dst,data,ct)
+        self.put(dst, data, ct)
         return 201
 
-    def copycol(self,src,dst):
+    def copycol(self, src, dst):
         """ copy a collection.
 
         As this is not recursive (the davserver recurses itself)
@@ -608,7 +606,7 @@ class openerp_dav_handler(dav_interface):
         return self.mkcol(dst)
 
 
-    def exists(self,uri):
+    def exists(self, uri):
         """ test if a resource exists """
         result = False
         cr, uid, pool,dbname, uri2 = self.get_cr(uri)
@@ -616,7 +614,7 @@ class openerp_dav_handler(dav_interface):
             if cr: cr.close()
             return True
         try:
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if node:
                 result = True
         except:
@@ -625,6 +623,6 @@ class openerp_dav_handler(dav_interface):
         return result
 
     @memoize(CACHE_SIZE)
-    def is_collection(self,uri):
+    def is_collection(self, uri):
         """ test if the given uri is a collection """
         return self._get_dav_resourcetype(uri)==COLLECTION
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index eec6c69ae16..2d323161bf0 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -35,7 +35,7 @@ from http://pywebdav.googlecode.com')
 
 
 super_mk_prop_response = PROPFIND.mk_prop_response
-def mk_prop_response(self,uri,good_props,bad_props,doc):        
+def mk_prop_response(self, uri, good_props, bad_props, doc):        
     """ make a new <prop> result element 
 
     We differ between the good props and the bad ones for
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 5f88f90cf11..59ce9c4bdb1 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -43,9 +43,13 @@ def OpenDAVConfig(**kw):
         def __init__(self, **kw):
             self.__dict__.update(**kw)
 
+        def getboolean(self, name):
+            return (str(getattr(self, name, 0)) in ('1', "yes", "true", "on", "True"))
+
     class Config:
         DAV = OpenDAV(**kw)
 
+
     return Config()
 
 
@@ -53,7 +57,6 @@ class DAVHandler(FixSendError,DAVRequestHandler):
     verbose = False
     
     def get_userinfo(self,user,pw):
-        print "get_userinfo"
         return False
     def _log(self, message):
         netsvc.Logger().notifyChannel("webdav",netsvc.LOG_DEBUG,message)
@@ -74,15 +77,15 @@ class DAVHandler(FixSendError,DAVRequestHandler):
 
     def setup(self):
         davpath = '/'+config.get_misc('webdav','vdir','webdav')
-        self.baseuri = "http://%s:%d/"% (self.server.server_name,self.server.server_port)
+        self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port)
         self.IFACE_CLASS  = openerp_dav_handler(self, self.verbose)
         
     
     def log_message(self, format, *args):
-        netsvc.Logger().notifyChannel('webdav',netsvc.LOG_DEBUG_RPC,format % args)
+        netsvc.Logger().notifyChannel('webdav', netsvc.LOG_DEBUG_RPC, format % args)
 
     def log_error(self, format, *args):
-        netsvc.Logger().notifyChannel('xmlrpc',netsvc.LOG_WARNING,format % args)
+        netsvc.Logger().notifyChannel('xmlrpc', netsvc.LOG_WARNING, format % args)
 
     def do_PUT(self):
         dc=self.IFACE_CLASS        
@@ -179,7 +182,7 @@ try:
         conf = OpenDAVConfig(**_dc)
         handler._config = conf
         reg_http_service(HTTPDir(directory,DAVHandler,OpenERPAuthProvider()))
-        netsvc.Logger().notifyChannel('webdav',netsvc.LOG_INFO,"WebDAV service registered at path: %s/ "% directory)
+        netsvc.Logger().notifyChannel('webdav', netsvc.LOG_INFO, "WebDAV service registered at path: %s/ "% directory)
 except Exception, e:
     logger = netsvc.Logger()
     logger.notifyChannel('webdav', netsvc.LOG_ERROR, 'Cannot launch webdav: %s' % e)