From b274d051847299a7dc52781fbc3ce0f61070138d Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 9 Sep 2012 14:26:40 -0400
Subject: [PATCH] - 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.

---
 CHANGES.txt       |  5 +++++
 pyramid/paster.py | 10 ----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b93a021936..7e0bf73cff 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 5102e7b9b2..b0e4d79331 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 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