summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-01-05 19:38:23 +0000
committerChris McDonough <chrism@agendaless.com>2010-01-05 19:38:23 +0000
commit4a3a68da7707cdb3c1dfaf61a3fb8a29644d431d (patch)
tree8fa6f443dc8c69f09471a7f0268b696178271b41
parent791a23ffbba7d22f2b66a04868f76fd97740d618 (diff)
downloadpyramid-4a3a68da7707cdb3c1dfaf61a3fb8a29644d431d.tar.gz
pyramid-4a3a68da7707cdb3c1dfaf61a3fb8a29644d431d.tar.bz2
pyramid-4a3a68da7707cdb3c1dfaf61a3fb8a29644d431d.zip
Normalize.
-rw-r--r--docs/narr/MyProject/myproject/run.py8
-rw-r--r--docs/tutorials/bfgwiki/src/authorization/tutorial/run.py5
-rw-r--r--docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py4
-rw-r--r--docs/tutorials/bfgwiki/src/models/tutorial/run.py5
-rw-r--r--docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py5
-rw-r--r--docs/tutorials/bfgwiki/src/views/tutorial/run.py5
-rw-r--r--docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py4
-rw-r--r--docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py4
-rw-r--r--docs/tutorials/bfgwiki2/src/models/tutorial/run.py5
-rw-r--r--docs/tutorials/bfgwiki2/src/views/tutorial/run.py5
-rw-r--r--repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl5
-rw-r--r--repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl5
-rw-r--r--repoze/bfg/paster_templates/starter/+package+/run.py_tmpl8
-rw-r--r--repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl5
14 files changed, 43 insertions, 30 deletions
diff --git a/docs/narr/MyProject/myproject/run.py b/docs/narr/MyProject/myproject/run.py
index 6a3671c1e..ce1c7a81e 100644
--- a/docs/narr/MyProject/myproject/run.py
+++ b/docs/narr/MyProject/myproject/run.py
@@ -2,9 +2,11 @@ from repoze.bfg.configuration import Configurator
from myproject.models import get_root
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``"""
+ """ This function returns a WSGI application.
+
+ It is usually called by the PasteDeploy framework during
+ ``paster serve``.
+ """
config = Configurator(root_factory=get_root, settings=settings)
config.begin()
zcml_file = settings.get('configure_zcml', 'configure.zcml')
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
index c80fce02a..6efc148c3 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
@@ -4,9 +4,10 @@ from repoze.zodbconn.finder import PersistentApplicationFinder
from tutorial.models import appmaker
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a 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/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py
index 15f5d84a4..d1575b19a 100644
--- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py
@@ -4,9 +4,9 @@ from repoze.zodbconn.finder import PersistentApplicationFinder
from tutorial.models import appmaker
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a WSGI application.
- It is usually called by the PasteDeploy framework during
+ It is usually called by the PasteDeploy framework during
``paster serve``.
"""
zodb_uri = settings.get('zodb_uri')
diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/run.py b/docs/tutorials/bfgwiki/src/models/tutorial/run.py
index 7d4220717..d1575b19a 100644
--- a/docs/tutorials/bfgwiki/src/models/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/models/tutorial/run.py
@@ -4,9 +4,10 @@ from repoze.zodbconn.finder import PersistentApplicationFinder
from tutorial.models import appmaker
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a 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/viewdecorators/tutorial/run.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py
index 7d4220717..d1575b19a 100644
--- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py
@@ -4,9 +4,10 @@ from repoze.zodbconn.finder import PersistentApplicationFinder
from tutorial.models import appmaker
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a 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/run.py b/docs/tutorials/bfgwiki/src/views/tutorial/run.py
index 7d4220717..d1575b19a 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/run.py
@@ -4,9 +4,10 @@ from repoze.zodbconn.finder import PersistentApplicationFinder
from tutorial.models import appmaker
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a 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/bfgwiki2/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
index 3fbf2419b..2506ca939 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
@@ -15,9 +15,9 @@ def handle_teardown(event):
environ['tutorial.sasession'] = Cleanup(DBSession.remove)
def app(global_config, **settings):
- """ This function returns a repoze.bfg.router.Router object.
+ """ This function returns a WSGI application.
- It is usually called by the PasteDeploy framework during
+ It is usually called by the PasteDeploy framework during
``paster serve``.
"""
db_string = settings.get('db_string')
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py
index 8593744b7..bc1197115 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py
@@ -14,9 +14,9 @@ def handle_teardown(event):
environ['tutorial.sasession'] = Cleanup(DBSession.remove)
def app(global_config, **settings):
- """ This function returns a repoze.bfg.router.Router object.
+ """ This function returns a WSGI application.
- It is usually called by the PasteDeploy framework during
+ It is usually called by the PasteDeploy framework during
``paster serve``.
"""
db_string = settings.get('db_string')
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py
index 332f0408f..d00d32265 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py
@@ -14,9 +14,10 @@ def handle_teardown(event):
environ['tutorial.sasession'] = Cleanup(DBSession.remove)
def app(global_config, **settings):
- """ This function returns a repoze.bfg.router.Router object.
+ """ This function returns a WSGI application.
- 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:
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
index 332f0408f..d00d32265 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
@@ -14,9 +14,10 @@ def handle_teardown(event):
environ['tutorial.sasession'] = Cleanup(DBSession.remove)
def app(global_config, **settings):
- """ This function returns a repoze.bfg.router.Router object.
+ """ This function returns a WSGI application.
- 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:
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl b/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
index 0c8f31ec8..c290431c0 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
@@ -14,9 +14,10 @@ def handle_teardown(event):
environ['usermanager.sasession'] = Cleanup(DBSession.remove)
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a WSGI application.
- It is usually called by the PasteDeploy framework during ``paster serve``.
+ It is usually called by the PasteDeploy framework during
+ ``paster serve``.
"""
zcml_file = settings.get('configure_zcml', 'configure.zcml')
db_string = settings.get('db_string')
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl b/repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl
index 066dbecc0..810040297 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl
@@ -14,9 +14,10 @@ def handle_teardown(event):
environ['{{package}}.sasession'] = Cleanup(DBSession.remove)
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application.
+ """ This function returns a WSGI application.
- It is usually called by the PasteDeploy framework during ``paster serve``.
+ It is usually called by the PasteDeploy framework during
+ ``paster serve``.
"""
zcml_file = settings.get('configure_zcml', 'configure.zcml')
db_string = settings.get('db_string')
diff --git a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
index 4505ed001..74876f3f4 100644
--- a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
@@ -2,9 +2,11 @@ from repoze.bfg.configuration import Configurator
from {{package}}.models import get_root
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` application object. It
- is usually called by the PasteDeploy framework during ``paster
- serve``"""
+ """ This function returns a WSGI application.
+
+ It is usually called by the PasteDeploy framework during
+ ``paster serve``.
+ """
zcml_file = settings.get('configure_zcml', 'configure.zcml')
config = Configurator(root_factory=get_root, settings=settings)
config.begin()
diff --git a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
index 22e2048e0..c0a245089 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
@@ -3,9 +3,10 @@ from repoze.zodbconn.finder import PersistentApplicationFinder
from {{package}}.models import appmaker
def app(global_config, **settings):
- """ This function returns a ``repoze.bfg`` WSGI application object.
+ """ This function returns a 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')
zcml_file = settings.get('configure_zcml', 'configure.zcml')