diff options
Diffstat (limited to 'docs/tutorials')
14 files changed, 52 insertions, 32 deletions
diff --git a/docs/tutorials/bfgwiki/installation.rst b/docs/tutorials/bfgwiki/installation.rst index 7955e7c9c..e66b40d0a 100644 --- a/docs/tutorials/bfgwiki/installation.rst +++ b/docs/tutorials/bfgwiki/installation.rst @@ -51,12 +51,14 @@ Preparation, UNIX #. (Optional) Consider using ``source bin/activate`` to make your shell environment wired to use the virtualenv. -#. Use ``easy_install`` and point to the BFG "1.2" index to get - :mod:`repoze.bfg` and its direct dependencies installed: +#. Use ``easy_install`` and point to the :mod:`repoze.bfg` "current" + index to get :mod:`repoze.bfg` and its direct dependencies + installed: .. code-block:: bash - $ bin/easy_install -i http://dist.repoze.org/bfg/1.2/simple repoze.bfg + $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple \ + repoze.bfg #. Use ``easy_install`` to install ``docutils``, ``repoze.tm``, ``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from @@ -104,13 +106,14 @@ Preparation, Windows #. (Optional) Consider using ``bin\activate.bat`` to make your shell environment wired to use the virtualenv. -#. Use ``easy_install`` and point to the BFG "1.2" index to get - :mod:`repoze.bfg` and its direct dependencies installed: +#. Use ``easy_install`` and point to the :mod:`repoze.bfg` "current" + index to get :mod:`repoze.bfg` and its direct dependencies + installed: .. code-block:: bat - c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/1.2/simple \ - repoze.bfg + c:\bigfntut> Scripts/easy_install -i \ + http://dist.repoze.org/bfg/current/simple repoze.bfg #. Use ``easy_install`` to install ``docutils``, ``repoze.tm``, ``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from @@ -118,7 +121,8 @@ Preparation, Windows .. code-block:: bat - c:\bigfntut> Scripts\easy_install -i http://dist.repoze.org/bfgsite/simple \ + c:\bigfntut> Scripts\easy_install -i \ + http://dist.repoze.org/bfgsite/simple \ docutils repoze.tm repoze.zodbconn repoze.who nose coverage .. _making_a_project: diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt index abe068352..12288d43d 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt @@ -17,9 +17,10 @@ <div class="main_content"> <div style="float:right; width: 10em;"> Viewing <span tal:replace="page.__name__">Page Name Goes Here</span> <br/> - You can return to the <a href="${request.application_url}">FrontPage</a>. - <span tal:condition="logged_in"><a href="${request.application_url}/logout"> - Logout</a></span> + You can return to the <a href="${request.application_url}" + >FrontPage</a>. + <span tal:condition="logged_in"><a + href="${request.application_url}/logout">Logout</a></span> </div> <div> diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py index 7d4220717..15f5d84a4 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py @@ -6,7 +6,8 @@ from tutorial.models import appmaker def app(global_config, **settings): """ This function returns a ``repoze.bfg`` WSGI application. - It is usually called by the PasteDeploy framework during ``paster serve``. + It is usually called by the PasteDeploy framework during + ``paster serve``. """ zodb_uri = settings.get('zodb_uri') if zodb_uri is None: diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt b/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt index 9035d6225..5b9a3da31 100644 --- a/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt +++ b/docs/tutorials/bfgwiki/src/views/tutorial/templates/view.pt @@ -18,7 +18,8 @@ <div class="main_content"> <div style="float:right; width: 10em;"> Viewing <span tal:replace="page.__name__">Page Name Goes Here</span> <br/> -You can return to the <a href="${request.application_url}">FrontPage</a>. +You can return to the +<a href="${request.application_url}">FrontPage</a>. </div> <div tal:replace="structure content">Page text goes here.</div> diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/tests.py b/docs/tutorials/bfgwiki/src/views/tutorial/tests.py index bbf86633a..1ebdbf63e 100644 --- a/docs/tutorials/bfgwiki/src/views/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/views/tutorial/tests.py @@ -86,8 +86,9 @@ class AddPageTests(unittest.TestCase): request.subpath = ['AnotherPage'] info = self._callFUT(context, request) self.assertEqual(info['page'].data,'') - self.assertEqual(info['save_url'], - model_url(context, request, 'add_page', 'AnotherPage')) + self.assertEqual( + info['save_url'], + model_url(context, request, 'add_page', 'AnotherPage')) def test_it_submitted(self): context = testing.DummyModel() diff --git a/docs/tutorials/bfgwiki2/installation.rst b/docs/tutorials/bfgwiki2/installation.rst index 689df9858..1a37e1c4d 100644 --- a/docs/tutorials/bfgwiki2/installation.rst +++ b/docs/tutorials/bfgwiki2/installation.rst @@ -56,12 +56,13 @@ Preparation, UNIX #. (Optional) Consider using ``source bin/activate`` to make your shell environment wired to use the virtualenv. -#. Use ``easy_install`` and point to the BFG "1.1" index to get +#. Use ``easy_install`` and point to the BFG "current" index to get :mod:`repoze.bfg` and its direct dependencies installed: .. code-block:: text - $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg + $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple \ + repoze.bfg #. Use ``easy_install`` to install various packages from PyPI. @@ -107,20 +108,21 @@ Preparation, Windows #. (Optional) Consider using ``bin\activate.bat`` to make your shell environment wired to use the virtualenv. -#. Use ``easy_install`` and point to the BFG "1.1" index to get +#. Use ``easy_install`` and point to the BFG "current" index to get :mod:`repoze.bfg` and its direct dependencies installed: .. code-block:: text - c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/1.1/simple \ - repoze.bfg + c:\bigfntut> Scripts/easy_install -i \ + http://dist.repoze.org/bfg/current/simple repoze.bfg #. Use ``easy_install`` to install various packages from PyPI. .. code-block:: text - c:\bigfntut> Scripts\easy_install -i docutils nose coverage zope.sqlalchemy \ - SQLAlchemy repoze.tm2 + c:\bigfntut> Scripts\easy_install -i \ + http://dist.repoze.org/bfg/current/simple docutils \ + nose coverage zope.sqlalchemy SQLAlchemy repoze.tm2 .. _sql_making_a_project: diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py index 2d4a06930..3fbf2419b 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py @@ -17,11 +17,13 @@ def handle_teardown(event): def app(global_config, **settings): """ This function returns a repoze.bfg.router.Router object. - It is usually called by the PasteDeploy framework during ``paster serve``. + It is usually called by the PasteDeploy framework during + ``paster serve``. """ db_string = settings.get('db_string') if db_string is None: - raise ValueError("No 'db_string' value in application configuration.") + raise ValueError( + "No 'db_string' value in application configuration.") initialize_sql(db_string) config = Configurator(settings=settings, root_factory=RootFactory) config.begin() diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt index 2482d8ca5..dd4e0691e 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/templates/edit.pt @@ -17,7 +17,8 @@ <div class="main_content"> <div style="float:right; width: 10em;"> Viewing <span tal:replace="page.name">Page Name Goes Here</span> <br/> - You can return to the <a href="${request.application_url}">FrontPage</a>. + You can return to the <a href="${request.application_url}" + >FrontPage</a>. <span tal:condition="logged_in"> <a href="${request.application_url}/logout">Logout</a> </span> diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/models.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/models.py index 63496583e..456a02a4f 100644 --- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/models.py +++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/models.py @@ -15,7 +15,8 @@ from sqlalchemy.orm import mapper from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) +DBSession = scoped_session( + sessionmaker(extension=ZopeTransactionExtension())) metadata = MetaData() diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py index 332f0408f..8593744b7 100644 --- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py @@ -16,11 +16,13 @@ def handle_teardown(event): def app(global_config, **settings): """ This function returns a repoze.bfg.router.Router object. - It is usually called by the PasteDeploy framework during ``paster serve``. + It is usually called by the PasteDeploy framework during + ``paster serve``. """ db_string = settings.get('db_string') if db_string is None: - raise ValueError("No 'db_string' value in application configuration.") + raise ValueError("No 'db_string' value in application " + "configuration.") initialize_sql(db_string) config = Configurator(settings=settings) config.begin() diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/models.py b/docs/tutorials/bfgwiki2/src/models/tutorial/models.py index 3e63c3734..0d062e01f 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/models.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/models.py @@ -14,7 +14,8 @@ from sqlalchemy.ext.declarative import declarative_base from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) +DBSession = scoped_session( + sessionmaker(extension=ZopeTransactionExtension())) Base = declarative_base() class Page(Base): diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py index 7bc8e11ce..15e00a355 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/tests.py @@ -124,7 +124,8 @@ class EditPageTests(unittest.TestCase): self.session.add(page) info = self._callFUT(request) self.assertEqual(info['page'], page) - self.assertEqual(info['save_url'], 'http://example.com/abc/edit_page') + self.assertEqual(info['save_url'], + 'http://example.com/abc/edit_page') def test_it_submitted(self): from tutorial.models import Page diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py index 410d25ec0..bb1a87932 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py @@ -33,7 +33,8 @@ def view_page(request): content = publish_parts(page.data, writer_name='html')['html_body'] content = wikiwords.sub(check, content) - edit_url = route_url('edit_page', request, pagename=matchdict['pagename']) + edit_url = route_url('edit_page', request, + pagename=matchdict['pagename']) return dict(page=page, content=content, edit_url=edit_url) def add_page(request): diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst index 6f6ccbb45..0c429dfbe 100644 --- a/docs/tutorials/modwsgi/index.rst +++ b/docs/tutorials/modwsgi/index.rst @@ -54,7 +54,8 @@ commands and files. .. code-block:: text $ cd ~/projects/modwsgi/env - $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg + $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple \ + repoze.bfg #. Create and install your :mod:`repoze.bfg` application. For the purposes of this tutorial, we'll just be using the ``bfg_starter`` |