From b2533554bb8816d412615595f4d7947f7779bf47 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 14 Aug 2011 22:44:22 -0400
Subject: - The ZODB wiki tutorial now uses the ``pyramid_zodbconn`` package
 rather   than the ``repoze.zodbconn`` package to provide ZODB integration.

- The ZODB scaffold now uses the ``pyramid_zodbconn`` package rather than the
  ``repoze.zodbconn`` package to provide ZODB integration.
---
 docs/tutorials/wiki/src/tests/development.ini      |  5 ++---
 docs/tutorials/wiki/src/tests/production.ini       |  5 ++---
 docs/tutorials/wiki/src/tests/setup.py             |  2 +-
 docs/tutorials/wiki/src/tests/tutorial/__init__.py | 17 +++++++----------
 docs/tutorials/wiki/src/tests/tutorial/tests.py    | 10 ++++------
 5 files changed, 16 insertions(+), 23 deletions(-)

(limited to 'docs/tutorials/wiki/src/tests')

diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index 48a093981..2db77b9ef 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -7,14 +7,13 @@ pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
 pyramid.includes = pyramid_debugtoolbar
+                   pyramid_zodbconn
                    pyramid_tm
 tm.attempts = 3
-
-zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [pipeline:main]
 pipeline =
-    egg:repoze.zodbconn#closer
     tutorial
 
 [server:main]
diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini
index 247d789a9..0462bae90 100644
--- a/docs/tutorials/wiki/src/tests/production.ini
+++ b/docs/tutorials/wiki/src/tests/production.ini
@@ -7,13 +7,12 @@ pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
 pyramid.includes = pyramid_tm
+                   pyramid_zodbconn
 tm.attempts = 3
-
-zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [pipeline:main]
 pipeline =
-    egg:repoze.zodbconn#closer
     tutorial
 
 [server:main]
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index b0fd80edd..137b2ee42 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -8,7 +8,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 requires = [
     'pyramid',
-    'repoze.zodbconn',
+    'pyramid_zodbconn',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'ZODB3',
diff --git a/docs/tutorials/wiki/src/tests/tutorial/__init__.py b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
index f7dab5f47..5daff6b22 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
@@ -1,12 +1,16 @@
-from repoze.zodbconn.finder import PersistentApplicationFinder
-
 from pyramid.config import Configurator
+from pyramid_zodbconn import get_connection
+
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
 
 from tutorial.models import appmaker
 from tutorial.security import groupfinder
 
+def root_factory(request):
+    conn = get_connection(request)
+    return appmaker(conn.root())
+
 def main(global_config, **settings):
     """ This function returns a WSGI application.
     
@@ -16,14 +20,7 @@ def main(global_config, **settings):
     authn_policy = AuthTktAuthenticationPolicy(secret='sosecret',
                                                callback=groupfinder)
     authz_policy = ACLAuthorizationPolicy()
-    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)
-    def get_root(request):
-        return finder(request.environ)
-    config = Configurator(root_factory=get_root, settings=settings,
+    config = Configurator(root_factory=root_factory, settings=settings,
                           authentication_policy=authn_policy,
                           authorization_policy=authz_policy)
     config.add_static_view('static', 'tutorial:static')
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index 86ddba7b7..b1d4e68c3 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -137,14 +137,12 @@ class FunctionalTests(unittest.TestCase):
         self.tmpdir = tempfile.mkdtemp()
 
         dbpath = os.path.join( self.tmpdir, 'test.db')
-        from repoze.zodbconn.uri import db_from_uri
-        db = db_from_uri('file://' + dbpath)
-        settings = { 'zodb_uri' : None }
+        uri = 'file://' + dbpath
+        settings = { 'zodbconn.uri' : uri ,
+                     'pyramid.includes': ['pyramid_zodbconn', 'pyramid_tm'] }
 
         app = main({}, **settings)
-        from repoze.zodbconn.connector import Connector
-        app = Connector(app, db)
-        self.db = db
+        self.db = app.registry.zodb_database
         from webtest import TestApp
         self.testapp = TestApp(app)
 
-- 
cgit v1.2.3