summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-06-21 14:37:06 -0400
committerChris McDonough <chrism@plope.com>2011-06-21 14:37:06 -0400
commite3eff4e219a3ab3a9a3687368eaf945a3beab60f (patch)
tree31bd34b6de5c73cda3abafab2279fc4f08c3e8ec
parente01f0747fbad12836471bbc24953f8f06985ba52 (diff)
parente3d6fe41302d52d9f1702408abf994cd50437b21 (diff)
downloadpyramid-e3eff4e219a3ab3a9a3687368eaf945a3beab60f.tar.gz
pyramid-e3eff4e219a3ab3a9a3687368eaf945a3beab60f.tar.bz2
pyramid-e3eff4e219a3ab3a9a3687368eaf945a3beab60f.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/paster.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/pyramid/paster.py b/pyramid/paster.py
index 28d3535df..b1f0a6c8b 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -2,11 +2,19 @@ import os
import sys
from code import interact
+import zope.deprecation
+
from paste.deploy import loadapp
from paste.script.command import Command
from pyramid.scripting import get_root
+from pyramid.scaffolds import PyramidTemplate # bw compat
+zope.deprecation.deprecated(
+ 'PyramidTemplate', ('pyramid.paster.PyramidTemplate was moved to '
+ 'pyramid.scaffolds.PyramidTemplate in Pyramid 1.1'),
+)
+
def get_app(config_file, name, loadapp=loadapp):
""" Return the WSGI application named ``name`` in the PasteDeploy
config file ``config_file``"""