From b60bdb238fbf7965121ef6073e70343428d6dc83 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 25 Oct 2010 10:30:28 -0400 Subject: first cut at converting bfg to pyramid --- docs/tutorials/bfgwiki/src/authorization/tutorial/login.py | 8 ++++---- docs/tutorials/bfgwiki/src/authorization/tutorial/models.py | 4 ++-- docs/tutorials/bfgwiki/src/authorization/tutorial/run.py | 2 +- docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py | 6 +++--- docs/tutorials/bfgwiki/src/authorization/tutorial/views.py | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'docs/tutorials/bfgwiki/src/authorization') 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 -- cgit v1.2.3