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

[Tres Seaver]

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

Modified Files:
      Tag: Zope-2_6-branch
	DA.py 
Log Message:
 - Merge RDM's fix for Collector #322 from his branch.

=== Zope/lib/python/Shared/DC/ZRDB/DA.py 1.105 => 1.105.6.1 ===
--- Zope/lib/python/Shared/DC/ZRDB/DA.py:1.105	Wed Aug 14 17:50:59 2002
+++ Zope/lib/python/Shared/DC/ZRDB/DA.py	Mon Dec 16 18:28:03 2002
@@ -411,7 +411,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