[Zope-Checkins] CVS: Zope/lib/python/Shared/DC/ZRDB - DA.py:1.105.4.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Shared/DC/ZRDB
In directory cvs.zope.org:/tmp/cvs-serv27774/DC/ZRDB

Modified Files:
      Tag: chrism-install-branch
	DA.py 
Log Message:
Merging chrism-install-branch with HEAD (hopefully for one of the last
times).



=== Zope/lib/python/Shared/DC/ZRDB/DA.py 1.105.4.1 => 1.105.4.2 ===
--- Zope/lib/python/Shared/DC/ZRDB/DA.py:1.105.4.1	Sun Nov 24 18:43:49 2002
+++ Zope/lib/python/Shared/DC/ZRDB/DA.py	Fri Jan  3 01:34:12 2003
@@ -426,7 +426,14 @@
 
         security=getSecurityManager()
         security.addContext(self)
-        try:     query=apply(self.template, (p,), argdata)
+        try:
+            try:     query=apply(self.template, (p,), argdata)
+            except TypeError, msg:
+                msg = str(msg)
+                if find(msg,'client'):
+                    raise NameError("'client' may not be used as an " +
+                        "argument name in this context")
+                else: raise
         finally: security.removeContext(self)
 
         if src__: return query