[FIX]Remove exception
bzr revid: dle@openerp.com-20121219161840-t5jrxrtly1jzm8lh
This commit is contained in:
parent
6fa12e9458
commit
6d49547fb6
|
@ -57,6 +57,7 @@ import re
|
|||
import time
|
||||
from string import atoi
|
||||
import addons
|
||||
import socket
|
||||
# from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
|
||||
from xml.dom import minidom
|
||||
from redirect import RedirectHTTPHandler
|
||||
|
@ -87,6 +88,12 @@ class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
|
|||
'DELETE', 'TRACE', 'REPORT', ]
|
||||
}
|
||||
|
||||
def __init__(self, request, client_address, server):
|
||||
self.request = request
|
||||
self.client_address = client_address
|
||||
self.server = server
|
||||
self.setup()
|
||||
|
||||
def get_userinfo(self, user, pw):
|
||||
return False
|
||||
|
||||
|
@ -118,15 +125,9 @@ class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
|
|||
return res
|
||||
|
||||
def setup(self):
|
||||
DAVRequestHandler.setup(self)
|
||||
self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
|
||||
addr, port = self.server.server_name, self.server.server_port
|
||||
server_proto = getattr(self.server,'proto', 'http').lower()
|
||||
try:
|
||||
if hasattr(self.request, 'getsockname'):
|
||||
addr, port = self.request.getsockname()
|
||||
except Exception, e:
|
||||
self.log_error("Cannot calculate own address: %s" , e)
|
||||
# Too early here to use self.headers
|
||||
self.baseuri = "%s://%s:%d/"% (server_proto, addr, port)
|
||||
self.IFACE_CLASS = openerp_dav_handler(self, self.verbose)
|
||||
|
|
Loading…
Reference in New Issue