8 files changed, 22 insertions, 18 deletions
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
index 3e9266754..f7dab5f47 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
@@ -16,8 +16,8 @@ def main(global_config, **settings):
     authn_policy = AuthTktAuthenticationPolicy(secret='sosecret',
                                                callback=groupfinder)
     authz_policy = ACLAuthorizationPolicy()
-    zodb_uri = settings.get('zodb_uri')
-    if zodb_uri is None:
+    zodb_uri = settings.get('zodb_uri', False)
+    if zodb_uri is False:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
     finder = PersistentApplicationFinder(zodb_uri, appmaker)
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
index a9f776980..6a4093a3b 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
@@ -5,8 +5,8 @@ from tutorial.models import appmaker
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
-    zodb_uri = settings.get('zodb_uri')
-    if zodb_uri is None:
+    zodb_uri = settings.get('zodb_uri', False)
+    if zodb_uri is False:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
     finder = PersistentApplicationFinder(zodb_uri, appmaker)
diff --git a/docs/tutorials/wiki/src/models/tutorial/__init__.py b/docs/tutorials/wiki/src/models/tutorial/__init__.py
index bf0f683bf..73fc81d23 100644
--- a/docs/tutorials/wiki/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/models/tutorial/__init__.py
@@ -5,8 +5,8 @@ from tutorial.models import appmaker
 def main(global_config, **settings):
     """ This function returns a WSGI application.
     """
-    zodb_uri = settings.get('zodb_uri')
-    if zodb_uri is None:
+    zodb_uri = settings.get('zodb_uri', False)
+    if zodb_uri is False:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
     finder = PersistentApplicationFinder(zodb_uri, appmaker)
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index d9ff866f1..0ce5ea718 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -139,16 +139,20 @@ class FunctionalTests(unittest.TestCase):
         self.tmpdir = tempfile.mkdtemp()
 
         dbpath = os.path.join( self.tmpdir, 'test.db')
-        settings = { 'zodb_uri' : 'file://' + dbpath }
+        from repoze.zodbconn.uri import db_from_uri
+        db = db_from_uri('file://' + dbpath)
+        settings = { 'zodb_uri' : None }
 
         app = main({}, **settings)
-        from repoze.zodbconn.middleware import EnvironmentDeleterMiddleware
-        app = EnvironmentDeleterMiddleware(app)
+        from repoze.zodbconn.connector import Connector
+        app = Connector(app, db)
+        self.db = db
         from webtest import TestApp
         self.testapp = TestApp(app)
 
     def tearDown(self):
         import shutil
+        self.db.close()
         shutil.rmtree( self.tmpdir )
 
     def test_root(self):
diff --git a/docs/tutorials/wiki/src/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py
index 91f7c2624..04a01fead 100644
--- a/docs/tutorials/wiki/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/views/tutorial/__init__.py
@@ -5,8 +5,8 @@ from tutorial.models import appmaker
 def main(global_config, **settings):
     """ This function returns a WSGI application.
     """
-    zodb_uri = settings.get('zodb_uri')
-    if zodb_uri is None:
+    zodb_uri = settings.get('zodb_uri', False)
+    if zodb_uri is False:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
     finder = PersistentApplicationFinder(zodb_uri, appmaker)
diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index f3151dbcc..c843a0129 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -73,6 +73,6 @@ The expected result looks something like:
 
    .........
    ----------------------------------------------------------------------
-   Ran 9 tests in 0.203s
+   Ran 23 tests in 1.653s
    
    OK
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl b/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
index 2fe3496aa..b5c9a2538 100644
--- a/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
@@ -5,8 +5,8 @@ from {{package}}.models import appmaker
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
-    zodb_uri = settings.get('zodb_uri')
-    if zodb_uri is None:
+    zodb_uri = settings.get('zodb_uri', False)
+    if zodb_uri is False:
         raise ValueError("No 'zodb_uri' in application configuration.")
 
     finder = PersistentApplicationFinder(zodb_uri, appmaker)
diff --git a/pyramid/url.py b/pyramid/url.py
index a9d7862fd..2a6fda89a 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -20,7 +20,7 @@ def route_url(route_name, request, *elements, **kw):
     """Generates a fully qualified URL for a named :app:`Pyramid`
     :term:`route configuration`.
 
-    .. note:: Calling :meth:`pyramid.request.Request.route_url` can be used to
+    .. note:: Calling :meth:`pyramid.Request.route_url` can be used to
               achieve the same result as :func:`pyramid.url.route_url`.
 
     Use the route's ``name`` as the first positional argument.  Use a
@@ -159,7 +159,7 @@ def route_path(route_name, request, *elements, **kw):
     """Generates a path (aka a 'relative URL', a URL minus the host, scheme,
     and port) for a named :app:`Pyramid` :term:`route configuration`.
 
-    .. note:: Calling :meth:`pyramid.request.Request.route_path` can be used to
+    .. note:: Calling :meth:`pyramid.Request.route_path` can be used to
               achieve the same result as :func:`pyramid.url.route_path`.
 
     This function accepts the same argument as :func:`pyramid.url.route_url`
@@ -191,7 +191,7 @@ def resource_url(resource, request, *elements, **kw):
     overall result of this function is always a UTF-8 encoded string
     (never Unicode).
 
-    .. note:: Calling :meth:`pyramid.request.Request.resource_url` can be used to
+    .. note:: Calling :meth:`pyramid.Request.resource_url` can be used to
               achieve the same result as :func:`pyramid.url.resource_url`.
 
     Examples::
@@ -325,7 +325,7 @@ def static_url(path, request, **kw):
     :meth:`pyramid.config.Configurator.add_static_view`
     :term:`configuration declaration` (see :ref:`static_assets_section`).
 
-    .. note:: Calling :meth:`pyramid.request.Request.static_url` can be used to
+    .. note:: Calling :meth:`pyramid.Request.static_url` can be used to
               achieve the same result as :func:`pyramid.url.static_url`.
 
     Example::