odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

KERNEL; USERS_LDAP: fix for compatibility with python2.3 

bzr revid: ced-e0c147ba38a4f1e84aef1e5c470ea80d56dcfad0
This commit is contained in:
ced 2007-03-08 20:10:05 +00:00
parent eddc2b7189
commit ed25abf408
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/netsvc.py
View File

@ -257,7 +257,10 @@ class HttpDaemon(threading.Thread):
def stop(self):
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()
# del self.server
@ -361,7 +364,10 @@ class TinySocketServerThread(threading.Thread):
for t in self.threads:
t.stop()
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()
except:
return False

4
bin/osv/orm.py
View File

@ -1531,7 +1531,7 @@ class orm(object):
def read_string(self, cr, uid, id, langs, fields=None, context={}):
res = {}
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:
fields = self._columns.keys() + self._inherit_fields.keys()
for lang in langs:
@ -1555,7 +1555,7 @@ class orm(object):
return res
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 field in vals:
if field in self._columns: