summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/models
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-13 01:00:39 -0400
committerChris McDonough <chrism@plope.com>2011-08-13 01:00:39 -0400
commit391402e63c1257ede0069f220ed5a1cca1b94a9b (patch)
tree014d867eff43e5f18b1723ce7d846c87c1c2e202 /docs/tutorials/wiki2/src/models
parentdd25a5afd44d3fdc89782d232dfe818245e496cd (diff)
downloadpyramid-391402e63c1257ede0069f220ed5a1cca1b94a9b.tar.gz
pyramid-391402e63c1257ede0069f220ed5a1cca1b94a9b.tar.bz2
pyramid-391402e63c1257ede0069f220ed5a1cca1b94a9b.zip
- Projects created via a scaffold no longer depend on the ``WebError``
package at all; configuration in the ``production.ini`` file which used to require its ``error_catcher`` middleware has been removed. Configuring error catching / email sending is now the domain of the ``pyramid_exclog`` package (see https://docs.pylonsproject.org/projects/pyramid_exclog/dev/).
Diffstat (limited to 'docs/tutorials/wiki2/src/models')
-rw-r--r--docs/tutorials/wiki2/src/models/production.ini15
-rw-r--r--docs/tutorials/wiki2/src/models/setup.py4
2 files changed, 2 insertions, 17 deletions
diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini
index c80a0a216..45ef791b7 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -10,23 +10,8 @@ pyramid.includes = pyramid_tm
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
-[filter:weberror]
-use = egg:WebError#error_catcher
-debug = false
-;error_log =
-;show_exceptions_in_wsgi_errors = true
-;smtp_server = localhost
-;error_email = janitor@example.com
-;smtp_username = janitor
-;smtp_password = "janitor's password"
-;from_address = paste@localhost
-;error_subject_prefix = "Pyramid Error"
-;smtp_use_tls =
-;error_message =
-
[pipeline:main]
pipeline =
- weberror
tutorial
[server:main]
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index eaf1ddcfe..99b7cabda 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -11,9 +11,9 @@ requires = [
'pyramid',
'SQLAlchemy',
'transaction',
- 'repoze.tm2>=1.0b1', # default_commit_veto
+ 'pyramid_tm',
+ 'pyramid_debugtoolbar',
'zope.sqlalchemy',
- 'WebError',
]
if sys.version_info[:3] < (2,5,0):