From 8fc798fa48f1414d4c23bbcc8720b7a1d5d96cf1 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Wed, 27 May 2009 23:27:27 +0000
Subject: - Removed backwards compatibility aliases for  
 ``repoze.bfg.router.get_options`` and ``repoze.bfg.router.Settings``  
 (deprecated since 0.6.2).  These both must now be imported from  
 ``repoze.bfg.settings``.

---
 CHANGES.txt            |  8 ++++++++
 repoze/bfg/registry.py | 14 --------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0e246089e..8e222d22f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,14 @@ Documentation
   step-by-step how to create a traversal-based ZODB application with
   authentication.
 
+Deprecated Alias Removals
+-------------------------
+
+- Removed backwards compatibility aliases for
+  ``repoze.bfg.router.get_options`` and ``repoze.bfg.router.Settings``
+  (deprecated since 0.6.2).  These both must now be imported from
+  ``repoze.bfg.settings``.
+
 0.9a2 (2009-05-27)
 ==================
 
diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 68c27dfa4..3827c8376 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -14,20 +14,6 @@ from repoze.bfg.threadlocal import manager
 
 from repoze.bfg.zcml import zcml_configure
 
-from repoze.bfg.settings import Settings  # alias for deprecation below
-
-deprecated('Settings',
-    "('from repoze.bfg.registry import Settings' is now "
-    "deprecated; instead use 'from repoze.bfg.settings import Settings')",
-    )
-
-from repoze.bfg.settings import get_options # alias for deprecation below
-
-deprecated('get_options',
-    "('from repoze.bfg.registry import get_options' is now "
-    "deprecated; instead use 'from repoze.bfg.settings import get_options')",
-    )
-
 class Registry(Components):
 
     # for optimization purposes, if no listeners are listening, don't try
-- 
cgit v1.2.3