summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-09 14:26:40 -0400
committerChris McDonough <chrism@plope.com>2012-09-09 14:26:40 -0400
commitb274d051847299a7dc52781fbc3ce0f61070138d (patch)
tree321557f97a0005f8014f0de47ab934583bb50c93
parentdeaf45b8e2847c5393b2e8fc354c79b52aa9a988 (diff)
downloadpyramid-b274d051847299a7dc52781fbc3ce0f61070138d.tar.gz
pyramid-b274d051847299a7dc52781fbc3ce0f61070138d.tar.bz2
pyramid-b274d051847299a7dc52781fbc3ce0f61070138d.zip
- The ``pyramid.paster.PyramidTemplate`` API was removed. It had been
deprecated since Pyramid 1.1 and issued a warning on import. If your code depended on this, adjust your code to import ``pyramid.scaffolds.PyramidTemplate`` instead.
-rw-r--r--CHANGES.txt5
-rw-r--r--pyramid/paster.py10
2 files changed, 5 insertions, 10 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b93a02193..7e0bf73cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -187,6 +187,11 @@ Backwards Incompatibilities
since Pyramid 1.0 and printed a deprecation warning upon its use. Use
``pyramid.config`` instead.
+- The ``pyramid.paster.PyramidTemplate`` API was removed. It had been
+ deprecated since Pyramid 1.1 and issued a warning on import. If your code
+ depended on this, adjust your code to import
+ ``pyramid.scaffolds.PyramidTemplate`` instead.
+
Dependencies
------------
diff --git a/pyramid/paster.py b/pyramid/paster.py
index 5102e7b9b..b0e4d7933 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -1,7 +1,5 @@
import os
-import zope.deprecation
-
from paste.deploy import (
loadapp,
appconfig,
@@ -10,14 +8,6 @@ from paste.deploy import (
from pyramid.compat import configparser
from logging.config import fileConfig
from pyramid.scripting import prepare
-from pyramid.scaffolds import PyramidTemplate # bw compat
-
-PyramidTemplate = PyramidTemplate # pyflakes
-
-zope.deprecation.deprecated(
- 'PyramidTemplate', ('pyramid.paster.PyramidTemplate was moved to '
- 'pyramid.scaffolds.PyramidTemplate in Pyramid 1.1'),
-)
def get_app(config_uri, name=None, loadapp=loadapp):
""" Return the WSGI application named ``name`` in the PasteDeploy