From ed25abf408f6a155f970578ea32010836ca132f3 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 8 Mar 2007 20:10:05 +0000
Subject: [PATCH] KERNEL; USERS_LDAP: fix for compatibility with python2.3

bzr revid: ced-e0c147ba38a4f1e84aef1e5c470ea80d56dcfad0
---
 bin/netsvc.py  | 10 ++++++++--
 bin/osv/orm.py |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index 833154628e0..c457097966c 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -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
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 92c533e3ca0..44726c47ce3 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -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: