- Removed backwards compatibility alias for

  ``repoze.bfg.interfaces.IRootPolicy`` (deprecated since 0.6.2).  It
  must be imported as ``repoze.bfg.interfaces.IRootFactory`` now.

- Removed backwards compatibility alias for
  ``repoze.bfg.interfaces.ITemplate`` (deprecated since 0.4.4).  It
  must be imported as ``repoze.bfg.interfaces.ITemplateRenderer`` now.

- Removed backwards compatibility alias for
  ``repoze.bfg.interfaces.ITemplateFactory`` (deprecated since 0.4.4).
  It must be imported as
  ``repoze.bfg.interfaces.ITemplateRendererFactory`` now.

- Removed backwards compatibility alias for
  ``repoze.bfg.chameleon_zpt.ZPTTemplateFactory`` (deprecated since
  0.4.4).  This must be imported as ``repoze.bfg.ZPTTemplateRenderer``
  now.

3 files changed, 20 insertions, 27 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 9610e3713..b568193c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,7 +35,7 @@ Deprecated Alias Removals
 -------------------------
 
 - Remove ``repoze.bfg.template`` module.  All imports from this
-  package have been deprecated since version 0.3.8.  Instead, import
+  package have been deprecated since 0.3.8.  Instead, import
   ``get_template``, ``render_template``, and
   ``render_template_to_response`` from the
   ``repoze.bfg.chameleon_zpt``module.
@@ -54,6 +54,25 @@ Deprecated Alias Removals
   (deprecated since 0.6.2).  These both must now be imported from
   ``repoze.bfg.settings``.
 
+- Removed backwards compatibility alias for
+  ``repoze.bfg.interfaces.IRootPolicy`` (deprecated since 0.6.2).  It
+  must be imported as ``repoze.bfg.interfaces.IRootFactory`` now.
+
+- Removed backwards compatibility alias for
+  ``repoze.bfg.interfaces.ITemplate`` (deprecated since 0.4.4).  It
+  must be imported as ``repoze.bfg.interfaces.ITemplateRenderer`` now.
+
+- Removed backwards compatibility alias for
+  ``repoze.bfg.interfaces.ITemplateFactory`` (deprecated since 0.4.4).
+  It must be imported as
+  ``repoze.bfg.interfaces.ITemplateRendererFactory`` now.
+
+- Removed backwards compatibility alias for
+  ``repoze.bfg.chameleon_zpt.ZPTTemplateFactory`` (deprecated since
+  0.4.4).  This must be imported as ``repoze.bfg.ZPTTemplateRenderer``
+  now.
+
+
 0.9a2 (2009-05-27)
 ==================
 
diff --git a/repoze/bfg/chameleon_zpt.py b/repoze/bfg/chameleon_zpt.py
index 624e92e07..f4f899879 100644
--- a/repoze/bfg/chameleon_zpt.py
+++ b/repoze/bfg/chameleon_zpt.py
@@ -4,7 +4,6 @@ from zope.component import queryUtility
 
 from zope.interface import classProvides
 from zope.interface import implements
-from zope.deprecation import deprecated
 
 from repoze.bfg.interfaces import IResponseFactory
 from repoze.bfg.interfaces import ITemplateRenderer
@@ -27,11 +26,6 @@ class ZPTTemplateRenderer(object):
     def __call__(self, **kw):
         return self.template(**kw)
 
-ZPTTemplateFactory = ZPTTemplateRenderer
-deprecated('ZPTTemplateFactory',
-           ('repoze.bfg.chameleon_zpt.ZPTTemplateFactory should now be '
-            'imported as repoze.bfg.chameleon_zpt.ZPTTemplateRenderer'))
-
 def _auto_reload():
     settings = queryUtility(ISettings)
     auto_reload = settings and settings.reload_templates
diff --git a/repoze/bfg/interfaces.py b/repoze/bfg/interfaces.py
index 2b00ac18f..c4bafbe20 100644
--- a/repoze/bfg/interfaces.py
+++ b/repoze/bfg/interfaces.py
@@ -1,8 +1,6 @@
 from zope.interface import Attribute
 from zope.interface import Interface
 
-from zope.deprecation import deprecated
-
 from zope.component.interfaces import IObjectEvent
 
 class IRequestFactory(Interface):
@@ -51,12 +49,6 @@ class IRootFactory(Interface):
     def __call__(environ):
         """ Return a root object """
 
-IRootPolicy = IRootFactory
-deprecated('IRootPolicy',
-           '(repoze.bfg.interfaces.IRootPolicy should now be imported '
-           'as repoze.bfg.interfaces.IRootFactory)',
-           )
-
 class ITraverser(Interface):
     def __call__(environ):
         """ Return a dictionary with the keys ``root``, ``context``,
@@ -91,22 +83,10 @@ class ITemplateRenderer(Interface):
         passed in as arguments and return the result (a string or
         unicode object) """
 
-ITemplate = ITemplateRenderer
-deprecated('ITemplate',
-           '(repoze.bfg.interfaces.ITemplate should now be imported '
-           'as repoze.bfg.interfaces.ITemplateRenderer)',
-           )
-
 class ITemplateRendererFactory(Interface):
     def __call__(path, auto_reload=False):
         """ Return an object that implements ``ITemplateRenderer``  """
 
-ITemplateFactory = ITemplateRendererFactory
-deprecated('ITemplateFactory',
-           '(repoze.bfg.interfaces.ITemplateFactory should now be imported '
-           'as repoze.bfg.interfaces.ITemplateRendererFactory)',
-           )
-
 class ISecurityPolicy(Interface):
     """ A utility that provides a mechanism to check authorization
        using authentication data """