KERNEL; USERS_LDAP: fix for compatibility with python2.3
bzr revid: ced-e0c147ba38a4f1e84aef1e5c470ea80d56dcfad0
This commit is contained in:
parent
eddc2b7189
commit
ed25abf408
|
@ -257,7 +257,10 @@ class HttpDaemon(threading.Thread):
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
self.running = False
|
self.running = False
|
||||||
self.server.socket.shutdown(socket.SHUT_RDWR)
|
if hasattr(socket, 'SHUT_RDWR'):
|
||||||
|
self.server.socket.shutdown(socket.SHUT_RDWR)
|
||||||
|
else:
|
||||||
|
self.server.socket.shutdown(2)
|
||||||
self.server.socket.close()
|
self.server.socket.close()
|
||||||
# self.server.socket.close()
|
# self.server.socket.close()
|
||||||
# del self.server
|
# del self.server
|
||||||
|
@ -361,7 +364,10 @@ class TinySocketServerThread(threading.Thread):
|
||||||
for t in self.threads:
|
for t in self.threads:
|
||||||
t.stop()
|
t.stop()
|
||||||
try:
|
try:
|
||||||
self.socket.shutdown(socket.SHUT_RDWR)
|
if hasattr(socket, 'SHUT_RDWR'):
|
||||||
|
self.socket.shutdown(socket.SHUT_RDWR)
|
||||||
|
else:
|
||||||
|
self.socket.shutdown(2)
|
||||||
self.socket.close()
|
self.socket.close()
|
||||||
except:
|
except:
|
||||||
return False
|
return False
|
||||||
|
|
|
@ -1531,7 +1531,7 @@ class orm(object):
|
||||||
def read_string(self, cr, uid, id, langs, fields=None, context={}):
|
def read_string(self, cr, uid, id, langs, fields=None, context={}):
|
||||||
res = {}
|
res = {}
|
||||||
res2 = {}
|
res2 = {}
|
||||||
self.pool.get('ir.model.access').check(cr, uid, self._name, 'read')
|
self.pool.get('ir.model.access').check(cr, uid, 'ir.translation', 'read')
|
||||||
if not fields:
|
if not fields:
|
||||||
fields = self._columns.keys() + self._inherit_fields.keys()
|
fields = self._columns.keys() + self._inherit_fields.keys()
|
||||||
for lang in langs:
|
for lang in langs:
|
||||||
|
@ -1555,7 +1555,7 @@ class orm(object):
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def write_string(self, cr, uid, id, langs, vals, context={}):
|
def write_string(self, cr, uid, id, langs, vals, context={}):
|
||||||
self.pool.get('ir.model.access').check(cr, uid, self._name, 'write')
|
self.pool.get('ir.model.access').check(cr, uid, 'ir.translation', 'write')
|
||||||
for lang in langs:
|
for lang in langs:
|
||||||
for field in vals:
|
for field in vals:
|
||||||
if field in self._columns:
|
if field in self._columns:
|
||||||
|
|
Loading…
Reference in New Issue