[Zope-Checkins] SVN: Zope/branches/2.11/ - Launchpad ##332168: Connection.py: do not expose DB connection strings

[Andreas Jung]

Log message for revision 96950:
  - Launchpad ##332168: Connection.py: do not expose DB connection strings
    through exceptions
  

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Shared/DC/ZRDB/Connection.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.11/doc/CHANGES.txt	2009-02-21 15:26:01 UTC (rev 96949)
+++ Zope/branches/2.11/doc/CHANGES.txt	2009-02-21 15:27:09 UTC (rev 96950)
@@ -27,6 +27,9 @@
 
     Bugs Fixed
 
+      - Launchpad ##332168: Connection.py: do not expose DB connection strings
+        through exceptions
+
       - LP/#324876: tighened regex for detecting the charset
         from a meta-equiv header
 

Modified: Zope/branches/2.11/lib/python/Shared/DC/ZRDB/Connection.py
===================================================================
--- Zope/branches/2.11/lib/python/Shared/DC/ZRDB/Connection.py	2009-02-21 15:26:01 UTC (rev 96949)
+++ Zope/branches/2.11/lib/python/Shared/DC/ZRDB/Connection.py	2009-02-21 15:27:09 UTC (rev 96950)
@@ -190,9 +190,9 @@
             except:
                 t, v, tb = sys.exc_info()
                 raise BadRequest, (
-                    '<strong>Invalid connection string: </strong><CODE>%s</CODE><br>\n'
+                    '<strong>Error connecting to DB.</strong><br>\n'
                     '<!--\n%s\n%s\n-->\n'
-                    % (s,t,v)), tb
+                    % (t,v)), tb
         finally: tb=None
         self._v_connected=DateTime()