diff options
| author | RHA (Open ERP) <> | 2010-08-19 17:21:57 +0530 |
|---|---|---|
| committer | uco (Open ERP) <uco@tinyerp.com> | 2010-08-19 17:21:57 +0530 |
| commit | d5ad0b8ff144886a2a5b3766a297b72f59633184 (patch) | |
| tree | 41b9ddcbc43c498f630a7455c46c4dc3c69fc62f /addons/document_webdav/webdav_server.py | |
| parent | 2eaf0ee8a420b5273e173e5069355a17c874349e (diff) | |
[CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
Diffstat (limited to 'addons/document_webdav/webdav_server.py')
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 8a83e25456d..44592243480 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -44,7 +44,7 @@ def OpenDAVConfig(**kw): class OpenDAV: def __init__(self, **kw): self.__dict__.update(**kw) - + def getboolean(self, word): return self.__dict__.get(word, False) @@ -58,7 +58,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): verbose = False protocol_version = 'HTTP/1.1' _HTTP_OPTIONS= { 'DAV' : ['1',], - 'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT', + 'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT', 'PROPFIND', 'PROPPATCH', 'OPTIONS', 'MKCOL', 'DELETE', 'TRACE', 'REPORT', ] } @@ -67,7 +67,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): return False def _log(self, message): netsvc.Logger().notifyChannel("webdav",netsvc.LOG_DEBUG,message) - + def handle(self): self._init_buffer() @@ -83,7 +83,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): self.davpath = '/'+config.get_misc('webdav','vdir','webdav') self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port) self.IFACE_CLASS = openerp_dav_handler(self, self.verbose) - + def copymove(self, CLASS): """ Our uri scheme removes the /webdav/ component from there, so we need to mangle the header, too. @@ -98,7 +98,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): def get_davpath(self): return self.davpath - + def log_message(self, format, *args): netsvc.Logger().notifyChannel('webdav', netsvc.LOG_DEBUG_RPC, format % args) @@ -111,7 +111,6 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): uri=urlparse.urljoin(self.get_baseuri(dc), self.path) uri=urllib.unquote(uri) try: - #location = dc.put(uri,body,ct) ret = dc.prep_http_options(uri, opts) except DAV_Error, (ec,dd): pass @@ -119,7 +118,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): self.log_error("Error at options: %s", str(e)) raise return ret - + def send_response(self, code, message=None): # the BufferingHttpServer will send Connection: close , while # the BaseHTTPRequestHandler will only accept int code. @@ -148,15 +147,15 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): ctype=ctype, headers=headers) def do_PUT(self): - dc=self.IFACE_CLASS + dc=self.IFACE_CLASS uri=urlparse.urljoin(self.get_baseuri(dc), self.path) uri=urllib.unquote(uri) # Handle If-Match if self.headers.has_key('If-Match'): test = False etag = None - - for match in self.headers['If-Match'].split(','): + + for match in self.headers['If-Match'].split(','): if match.startswith('"') and match.endswith('"'): match = match[1:-1] if match == '*': @@ -175,7 +174,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): # Handle If-None-Match if self.headers.has_key('If-None-Match'): test = True - etag = None + etag = None for match in self.headers['If-None-Match'].split(','): if match == '*': if dc.exists(uri): @@ -259,14 +258,14 @@ class DAVAuthProvider(OpenERPAuthProvider): try: if (config.get_misc('webdav','enable',True)): - directory = '/'+config.get_misc('webdav','vdir','webdav') + directory = '/'+config.get_misc('webdav','vdir','webdav') handler = DAVHandler verbose = config.get_misc('webdav','verbose',True) handler.debug = config.get_misc('webdav','debug',True) _dc = { 'verbose' : verbose, 'directory' : directory, 'lockemulation' : False, - + } conf = OpenDAVConfig(**_dc) |
