diff options
Diffstat (limited to 'docs')
29 files changed, 53 insertions, 53 deletions
diff --git a/docs/narr/MyProject/myproject/run.py b/docs/narr/MyProject/myproject/run.py index ce1c7a81e..9b6ba7072 100644 --- a/docs/narr/MyProject/myproject/run.py +++ b/docs/narr/MyProject/myproject/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from myproject.models import get_root def app(global_config, **settings): diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py index 498bd96e8..e179819d7 100644 --- a/docs/narr/MyProject/myproject/tests.py +++ b/docs/narr/MyProject/myproject/tests.py @@ -1,7 +1,7 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing class ViewTests(unittest.TestCase): def setUp(self): diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py index 8620dc705..c029f25ce 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py @@ -1,10 +1,10 @@ from webob.exc import HTTPFound -from repoze.bfg.view import bfg_view -from repoze.bfg.url import model_url +from pyramid.view import bfg_view +from pyramid.url import model_url -from repoze.bfg.security import remember -from repoze.bfg.security import forget +from pyramid.security import remember +from pyramid.security import forget from tutorial.models import Wiki from tutorial.security import USERS diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py index 08e1da7e4..dcffc28ac 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py @@ -1,8 +1,8 @@ from persistent import Persistent from persistent.mapping import PersistentMapping -from repoze.bfg.security import Allow -from repoze.bfg.security import Everyone +from pyramid.security import Allow +from pyramid.security import Everyone class Wiki(PersistentMapping): __name__ = None diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py index 6efc148c3..875e77590 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder from tutorial.models import appmaker diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py index 6853bc376..d082fb84d 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from repoze.bfg import testing +from pyramid import testing class PageModelTests(unittest.TestCase): @@ -80,7 +80,7 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from repoze.bfg.url import model_url + from pyramid.url import model_url context = testing.DummyModel() request = testing.DummyRequest() request.subpath = ['AnotherPage'] @@ -106,7 +106,7 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from repoze.bfg.url import model_url + from pyramid.url import model_url context = testing.DummyModel() request = testing.DummyRequest() info = self._callFUT(context, request) diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py index 17ca01566..f0fef5d81 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py @@ -2,11 +2,11 @@ from docutils.core import publish_parts import re from webob.exc import HTTPFound -from repoze.bfg.url import model_url +from pyramid.url import model_url -from repoze.bfg.security import authenticated_userid +from pyramid.security import authenticated_userid -from repoze.bfg.view import bfg_view +from pyramid.view import bfg_view from tutorial.models import Page from tutorial.models import Wiki diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py index d1575b19a..5eef90841 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder from tutorial.models import appmaker diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/tests.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/tests.py index 32821ce0e..e11b3625e 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/tests.py @@ -1,7 +1,7 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing class ViewTests(unittest.TestCase): def setUp(self): diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/run.py b/docs/tutorials/bfgwiki/src/models/tutorial/run.py index d1575b19a..5eef90841 100644 --- a/docs/tutorials/bfgwiki/src/models/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/models/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder from tutorial.models import appmaker diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/tests.py b/docs/tutorials/bfgwiki/src/models/tutorial/tests.py index 1eee68e7f..2f5bc48e3 100644 --- a/docs/tutorials/bfgwiki/src/models/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/models/tutorial/tests.py @@ -1,7 +1,7 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing class PageModelTests(unittest.TestCase): diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py index d1575b19a..5eef90841 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder from tutorial.models import appmaker diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/tests.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/tests.py index 6853bc376..d082fb84d 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from repoze.bfg import testing +from pyramid import testing class PageModelTests(unittest.TestCase): @@ -80,7 +80,7 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from repoze.bfg.url import model_url + from pyramid.url import model_url context = testing.DummyModel() request = testing.DummyRequest() request.subpath = ['AnotherPage'] @@ -106,7 +106,7 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from repoze.bfg.url import model_url + from pyramid.url import model_url context = testing.DummyModel() request = testing.DummyRequest() info = self._callFUT(context, request) diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py index 08489f4ef..60cb49faa 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py +++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py @@ -2,8 +2,8 @@ from docutils.core import publish_parts import re from webob.exc import HTTPFound -from repoze.bfg.url import model_url -from repoze.bfg.view import bfg_view +from pyramid.url import model_url +from pyramid.view import bfg_view from tutorial.models import Page from tutorial.models import Wiki diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/run.py b/docs/tutorials/bfgwiki/src/views/tutorial/run.py index d1575b19a..5eef90841 100644 --- a/docs/tutorials/bfgwiki/src/views/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/views/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder from tutorial.models import appmaker diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/tests.py b/docs/tutorials/bfgwiki/src/views/tutorial/tests.py index 1ebdbf63e..c5aafcac5 100644 --- a/docs/tutorials/bfgwiki/src/views/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/views/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from repoze.bfg import testing +from pyramid import testing class PageModelTests(unittest.TestCase): @@ -80,7 +80,7 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from repoze.bfg.url import model_url + from pyramid.url import model_url context = testing.DummyModel() request = testing.DummyRequest() request.subpath = ['AnotherPage'] @@ -107,7 +107,7 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from repoze.bfg.url import model_url + from pyramid.url import model_url context = testing.DummyModel() request = testing.DummyRequest() info = self._callFUT(context, request) diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/views.py b/docs/tutorials/bfgwiki/src/views/tutorial/views.py index 57ca24d1b..f13ed0381 100644 --- a/docs/tutorials/bfgwiki/src/views/tutorial/views.py +++ b/docs/tutorials/bfgwiki/src/views/tutorial/views.py @@ -2,7 +2,7 @@ from docutils.core import publish_parts import re from webob.exc import HTTPFound -from repoze.bfg.url import model_url +from pyramid.url import model_url from tutorial.models import Page diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py index 893a07a5d..1a54d575c 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py @@ -1,8 +1,8 @@ from webob.exc import HTTPFound -from repoze.bfg.security import remember -from repoze.bfg.security import forget -from repoze.bfg.url import route_url +from pyramid.security import remember +from pyramid.security import forget +from pyramid.url import route_url from tutorial.security import USERS diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/models.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/models.py index f8acf5f49..a77b4964c 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/models.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/models.py @@ -1,7 +1,7 @@ import transaction -from repoze.bfg.security import Allow -from repoze.bfg.security import Everyone +from pyramid.security import Allow +from pyramid.security import Everyone from sqlalchemy import create_engine from sqlalchemy import Column diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py index 65dbfd5d3..82ce37490 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from paste.deploy.converters import asbool from tutorial.models import initialize_sql diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/tests.py index 7bc8e11ce..65330ce17 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/tests.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/tests.py @@ -1,7 +1,7 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing def _initTestingDB(): from tutorial.models import DBSession diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py index 49167a629..a7e7a57c7 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py @@ -4,8 +4,8 @@ from docutils.core import publish_parts from webob.exc import HTTPFound -from repoze.bfg.security import authenticated_userid -from repoze.bfg.url import route_url +from pyramid.security import authenticated_userid +from pyramid.url import route_url from tutorial.models import DBSession from tutorial.models import Page diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py index 35cd79e10..7225987ee 100644 --- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from paste.deploy.converters import asbool from tutorial.models import initialize_sql diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py index 2ef74cce7..72f0c89d8 100644 --- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py +++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing def _initTestingDB(): from tutorial.models import initialize_sql diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py index 35cd79e10..7225987ee 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from paste.deploy.converters import asbool from tutorial.models import initialize_sql diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py index 2ef74cce7..72f0c89d8 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py @@ -1,6 +1,6 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing def _initTestingDB(): from tutorial.models import initialize_sql diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py index 35cd79e10..7225987ee 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py @@ -1,4 +1,4 @@ -from repoze.bfg.configuration import Configurator +from pyramid.configuration import Configurator from paste.deploy.converters import asbool from tutorial.models import initialize_sql diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py index 15e00a355..40336fca4 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py @@ -1,7 +1,7 @@ import unittest -from repoze.bfg.configuration import Configurator -from repoze.bfg import testing +from pyramid.configuration import Configurator +from pyramid import testing def _initTestingDB(): from tutorial.models import DBSession diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py index bb1a87932..c0d793d38 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py @@ -4,7 +4,7 @@ from docutils.core import publish_parts from webob.exc import HTTPFound -from repoze.bfg.url import route_url +from pyramid.url import route_url from tutorial.models import DBSession from tutorial.models import Page |