diff options
Diffstat (limited to 'docs/tutorials/wiki2')
11 files changed, 27 insertions, 27 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst index b7e20a95b..8d30ab807 100644 --- a/docs/tutorials/wiki2/authorization.rst +++ b/docs/tutorials/wiki2/authorization.rst @@ -68,7 +68,7 @@ represents. .. note: Although we don't use the functionality here, the ``factory`` used to create route contexts may differ per-route as opposed to globally. See the ``factory`` argument to - :meth:`pyramid.configuration.Configurator.add_route` for more info. + :meth:`pyramid.config.Configurator.add_route` for more info. We'll pass the ``RootFactory`` we created in the step above in as the ``root_factory`` argument to a :term:`Configurator`. @@ -85,7 +85,7 @@ For any :app:`Pyramid` application to perform authorization, we need to add a We'll change our ``__init__.py`` file to enable an ``AuthTktAuthenticationPolicy`` and an ``ACLAuthorizationPolicy`` to enable declarative security checking. We'll also change ``__init__.py`` to add a -:meth:`pyramid.configuration.Configurator.add_view` call to points at our +:meth:`pyramid.config.Configurator.add_view` call to points at our ``login`` :term:`view callable`, also known as a :term:`forbidden view`. This configures our newly created login view to show up when :app:`Pyramid` detects that a view invocation can not be authorized. Also, we'll add diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index 01fdd351e..3e17f76e3 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -47,7 +47,7 @@ entry point happens to be the ``app`` function within the file named ``db_string``, etc. #. *Line 12*. We call - :meth:`pyramid.configuration.Configurator.add_static_view` with the + :meth:`pyramid.config.Configurator.add_static_view` with the arguments ``static`` (the name), and ``tutorial:static`` (the path). This registers a static resource view which will match any URL that starts with ``/static/``. This will serve up static resources for us from within the @@ -59,13 +59,13 @@ entry point happens to be the ``app`` function within the file named such as a CSS file. #. *Lines 13-14*. Register a :term:`route configuration` via the - :meth:`pyramid.configuration.Configurator.add_route` method that will be + :meth:`pyramid.config.Configurator.add_route` method that will be used when the URL is ``/``. Since this route has an ``pattern`` equalling ``/`` it is the "default" route. The argument named ``view`` with the value ``tutorial.views.my_view`` is the dotted name to a *function* we write (generated by the ``pyramid_routesalchemy`` template) that is given a ``request`` object and which returns a response or a dictionary. You - will use :meth:`pyramid.configuration.Configurator.add_route` statements + will use :meth:`pyramid.config.Configurator.add_route` statements in a :term:`URL dispatch` based application to map URLs to code. This route also names a ``view_renderer``, which is a template which lives in the ``templates`` subdirectory of the package. When the @@ -73,7 +73,7 @@ entry point happens to be the ``app`` function within the file named will use this template to create a response. #. *Line 15*. We use the - :meth:`pyramid.configuration.Configurator.make_wsgi_app` method to return + :meth:`pyramid.config.Configurator.make_wsgi_app` method to return a :term:`WSGI` application. Content Models with ``models.py`` diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst index 0f446bb4e..e3d611136 100644 --- a/docs/tutorials/wiki2/definingviews.rst +++ b/docs/tutorials/wiki2/definingviews.rst @@ -23,7 +23,7 @@ assumed to return a :term:`response` object. The request passed to every view that is called as the result of a route match has an attribute named ``matchdict`` that contains the elements placed into the URL by the ``pattern`` of a ``route`` statement. For instance, if a -call to :meth:`pyramid.configuration.Configurator.add_route` in +call to :meth:`pyramid.config.Configurator.add_route` in ``__init__.py`` had the pattern ``{one}/{two}``, and the URL at ``http://example.com/foo/bar`` was invoked, matching this pattern, the matchdict dictionary attached to the request passed to the view would have a @@ -255,7 +255,7 @@ body of this guide, however it is available `online This CSS file will be accessed via e.g. ``http://localhost:6543/static/style.css`` by virtue of the call we've -made to :meth:`pyramid.configuration.Configurator.add_static_view` within our +made to :meth:`pyramid.config.Configurator.add_static_view` within our ``__init__.py`` file. Any number and type of static resources can be placed in this directory (or subdirectories) and are just referred to by URL within templates. @@ -264,7 +264,7 @@ Mapping Views to URLs in ``__init__.py`` ======================================== The ``__init__.py`` file contains -:meth:`pyramid.configuration.Configurator.add_route` calls which serve to map +:meth:`pyramid.config.Configurator.add_route` calls which serve to map URLs via :term:`url dispatch` to view functions. First, we’ll get rid of the existing route created by the template using the name ``home``. It’s only an example and isn’t relevant to our application. diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py index dbac349b9..025b94927 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py @@ -1,4 +1,4 @@ -from pyramid.configuration import Configurator +from pyramid.config import Configurator from pyramid.authentication import AuthTktAuthenticationPolicy from pyramid.authorization import ACLAuthorizationPolicy diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/tests.py b/docs/tutorials/wiki2/src/authorization/tutorial/tests.py index c78899797..1020a8b99 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/tests.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from pyramid.configuration import Configurator +from pyramid.config import Configurator from pyramid import testing def _initTestingDB(): @@ -20,7 +20,7 @@ def _registerRoutes(config): class ViewWikiTests(unittest.TestCase): def setUp(self): - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): @@ -36,7 +36,7 @@ class ViewWikiTests(unittest.TestCase): class ViewPageTests(unittest.TestCase): def setUp(self): self.session = _initTestingDB() - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): @@ -71,7 +71,7 @@ class ViewPageTests(unittest.TestCase): class AddPageTests(unittest.TestCase): def setUp(self): self.session = _initTestingDB() - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): @@ -104,7 +104,7 @@ class AddPageTests(unittest.TestCase): class EditPageTests(unittest.TestCase): def setUp(self): self.session = _initTestingDB() - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py index 5236a538d..d27b891c0 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py @@ -1,4 +1,4 @@ -from pyramid.configuration import Configurator +from pyramid.config import Configurator from sqlalchemy import engine_from_config from tutorial.models import initialize_sql diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py index 2db1bc5b6..fa3788340 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py @@ -1,5 +1,5 @@ import unittest -from pyramid.configuration import Configurator +from pyramid.config import Configurator from pyramid import testing def _initTestingDB(): @@ -10,7 +10,7 @@ def _initTestingDB(): class TestMyView(unittest.TestCase): def setUp(self): - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() _initTestingDB() diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py index e1baa2d64..c912a015b 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py @@ -1,4 +1,4 @@ -from pyramid.configuration import Configurator +from pyramid.config import Configurator from sqlalchemy import engine_from_config from tutorial.models import initialize_sql diff --git a/docs/tutorials/wiki2/src/models/tutorial/tests.py b/docs/tutorials/wiki2/src/models/tutorial/tests.py index 72f0c89d8..42b0aaada 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/tests.py +++ b/docs/tutorials/wiki2/src/models/tutorial/tests.py @@ -1,5 +1,5 @@ import unittest -from pyramid.configuration import Configurator +from pyramid.config import Configurator from pyramid import testing def _initTestingDB(): @@ -9,7 +9,7 @@ def _initTestingDB(): class TestMyView(unittest.TestCase): def setUp(self): - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() _initTestingDB() diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py index 91c299e24..334fde814 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py @@ -1,4 +1,4 @@ -from pyramid.configuration import Configurator +from pyramid.config import Configurator from sqlalchemy import engine_from_config from tutorial.models import initialize_sql diff --git a/docs/tutorials/wiki2/src/views/tutorial/tests.py b/docs/tutorials/wiki2/src/views/tutorial/tests.py index 435e4b588..7b770f927 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/tests.py +++ b/docs/tutorials/wiki2/src/views/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from pyramid.configuration import Configurator +from pyramid.config import Configurator from pyramid import testing def _initTestingDB(): @@ -20,7 +20,7 @@ def _registerRoutes(config): class ViewWikiTests(unittest.TestCase): def setUp(self): - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): @@ -36,7 +36,7 @@ class ViewWikiTests(unittest.TestCase): class ViewPageTests(unittest.TestCase): def setUp(self): self.session = _initTestingDB() - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): @@ -71,7 +71,7 @@ class ViewPageTests(unittest.TestCase): class AddPageTests(unittest.TestCase): def setUp(self): self.session = _initTestingDB() - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): @@ -104,7 +104,7 @@ class AddPageTests(unittest.TestCase): class EditPageTests(unittest.TestCase): def setUp(self): self.session = _initTestingDB() - self.config = Configurator() + self.config = Configurator(autocommit=True) self.config.begin() def tearDown(self): |