[Zodb-checkins] CVS: Packages/ZEO - StorageServer.py:1.69.4.2

Toby Dickenson tdickenson@geminidataloggers.com
Mon, 30 Sep 2002 04:28:44 -0400


Update of /cvs-repository/Packages/ZEO
In directory cvs.zope.org:/tmp/cvs-serv12289

Modified Files:
      Tag: toby-extension-method-branch
	StorageServer.py 
Log Message:
zeo storage server doesnt allow extension methods to overwrite standard methods

=== Packages/ZEO/StorageServer.py 1.69.4.1 => 1.69.4.2 ===
--- Packages/ZEO/StorageServer.py:1.69.4.1	Mon Sep 30 04:16:49 2002
+++ Packages/ZEO/StorageServer.py	Mon Sep 30 04:28:36 2002
@@ -166,7 +166,8 @@
             pass
         else:
             for name in fn().keys():
-                setattr(self,name,getattr(self.storage,name))
+                if not hasattr(self,name):
+                    setattr(self,name,getattr(self.storage,name))
 
     def check_tid(self, tid, exc=None):
         caller = sys._getframe().f_back.f_code.co_name