[Repoze-checkins] r1265 - in repoze.zodbconn/trunk: . repoze/zodbconn repoze/zodbconn/tests

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Thu Jul 10 14:39:43 2008
New Revision: 1265

Log:
Use a separate dict for connection info.


Modified:
   repoze.zodbconn/trunk/   (props changed)
   repoze.zodbconn/trunk/repoze/zodbconn/middleware.py
   repoze.zodbconn/trunk/repoze/zodbconn/tests/test_middleware.py

Modified: repoze.zodbconn/trunk/repoze/zodbconn/middleware.py
==============================================================================
--- repoze.zodbconn/trunk/repoze/zodbconn/middleware.py	(original)
+++ repoze.zodbconn/trunk/repoze/zodbconn/middleware.py	Thu Jul 10 14:39:43 2008
@@ -28,17 +28,19 @@
     from repoze.zodbconn.manager import databases
     return ZODBConnectionMiddleware(app, databases, **kw)
 
-_ENV_PREFIX = 'repoze.zodbconn.'
+_ENV_KEY = 'repoze.zodbconn.connections'
 
 def add_conn(environ, name, conn):
-    environ[_ENV_PREFIX + name] = conn
+    conn_d = environ.setdefault(_ENV_KEY, {})
+    conn_d[name] = conn
     
 def get_conn(environ, name):
-    return environ.get(_ENV_PREFIX + name)
+    return environ.get(_ENV_KEY, {}).get(name)
 
 def del_conn(environ, name):
+    conn_d = environ.get(_ENV_KEY, {})
     try:
-        del environ[_ENV_PREFIX + name]
+        del conn_d[name]
     except KeyError:
         pass
 

Modified: repoze.zodbconn/trunk/repoze/zodbconn/tests/test_middleware.py
==============================================================================
--- repoze.zodbconn/trunk/repoze/zodbconn/tests/test_middleware.py	(original)
+++ repoze.zodbconn/trunk/repoze/zodbconn/tests/test_middleware.py	Thu Jul 10 14:39:43 2008
@@ -36,9 +36,10 @@
         conns = app.conns
         for conn in conns:
             self.assertEqual(conn.closed, True)
-        from repoze.zodbconn.middleware import _ENV_PREFIX
-        self.failIf(environ.has_key(_ENV_PREFIX + 'name1'))
-        self.failIf(environ.has_key(_ENV_PREFIX + 'name2'))
+        from repoze.zodbconn.middleware import _ENV_KEY
+        conn_d = environ.get(_ENV_KEY, {})
+        self.failIf(conn_d.has_key('name1'))
+        self.failIf(conn_d.has_key('name2'))
 
     def test_call_exc(self):
         app = DummyApp(result=['foo'], exception=ValueError)
@@ -52,9 +53,10 @@
         conns = app.conns
         for conn in conns:
             self.assertEqual(conn.closed, True)
-        from repoze.zodbconn.middleware import _ENV_PREFIX
-        self.failIf(environ.has_key(_ENV_PREFIX + 'name1'))
-        self.failIf(environ.has_key(_ENV_PREFIX + 'name2'))
+        from repoze.zodbconn.middleware import _ENV_KEY
+        conn_d = environ.get(_ENV_KEY, {})
+        self.failIf(conn_d.has_key('name1'))
+        self.failIf(conn_d.has_key('name2'))
 
 class DummyApp:
     def __init__(self, exception=None, result=()):
@@ -63,10 +65,8 @@
         self.conns = []
 
     def __call__(self, environ, start_response):
-        from repoze.zodbconn.middleware import _ENV_PREFIX
-        for name in environ.keys():
-            if name.startswith(_ENV_PREFIX):
-                self.conns.append(environ[name])
+        from repoze.zodbconn.middleware import _ENV_KEY
+        self.conns = environ.get(_ENV_KEY, {}).values()
         if self.exception:
             raise self.exception
         return self.result