From f272f27b106265e9151eabe850ca282f6035a246 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 21 Sep 2012 20:35:12 -0400
Subject: note potential 1.5 removals and remove dead code

---
 TODO.txt                 | 4 ++++
 pyramid/config/routes.py | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/TODO.txt b/TODO.txt
index 1686c27a2..6787b8a55 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -140,6 +140,10 @@ Future
 - 1.5: Maybe? deprecate set_request_property in favor of pointing people at
   add_request_method, schedule removal for 1.8?
 
+- 1.5: Remove pyramid.config.rendering set_renderer_globals_factory maybe.
+
+- 1.5: remove pyramid.config.route _add_view_from_route function.
+
 - 1.6: Remove IContextURL and TraversalContextURL.
 
 Probably Bad Ideas
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index 1a7fdfac9..30bebfb98 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -4,7 +4,6 @@ from pyramid.interfaces import (
     IRequest,
     IRouteRequest,
     IRoutesMapper,
-    PHASE1_CONFIG,
     PHASE2_CONFIG,
     )
 
-- 
cgit v1.2.3