From 292656e9a07eadb7ee12f5830c75304d8cb13660 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 12 Aug 2011 01:13:51 -0500
Subject: Removed unused ingress_alias_names.

---
 pyramid/tests/test_tweens.py | 6 ------
 pyramid/tweens.py            | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pyramid/tests/test_tweens.py b/pyramid/tests/test_tweens.py
index 5fa999e8a..a16fdad57 100644
--- a/pyramid/tests/test_tweens.py
+++ b/pyramid/tests/test_tweens.py
@@ -23,7 +23,6 @@ class TestTweens(unittest.TestCase):
         self.assertEqual(tweens.alias_to_name['name'], 'name')
         self.assertEqual(tweens.name_to_alias['name'], 'name')
         self.assertEqual(tweens.order, [(INGRESS, 'name')])
-        self.assertEqual(tweens.ingress_alias_names, ['name'])
         tweens.add_implicit('name2', 'factory2')
         self.assertEqual(tweens.names, ['name',  'name2'])
         self.assertEqual(tweens.factories,
@@ -32,7 +31,6 @@ class TestTweens(unittest.TestCase):
         self.assertEqual(tweens.name_to_alias['name2'], 'name2')
         self.assertEqual(tweens.order,
                          [(INGRESS, 'name'), (INGRESS, 'name2')])
-        self.assertEqual(tweens.ingress_alias_names, ['name', 'name2'])
         tweens.add_implicit('name3', 'factory3', over='name2')
         self.assertEqual(tweens.names,
                          ['name',  'name2', 'name3'])
@@ -44,7 +42,6 @@ class TestTweens(unittest.TestCase):
         self.assertEqual(tweens.order,
                          [(INGRESS, 'name'), (INGRESS, 'name2'),
                           ('name3', 'name2')])
-        self.assertEqual(tweens.ingress_alias_names, ['name', 'name2'])
 
     def test_add_implicit_withaliases(self):
         from pyramid.tweens import INGRESS
@@ -56,7 +53,6 @@ class TestTweens(unittest.TestCase):
         self.assertEqual(tweens.alias_to_name['n1'], 'name1')
         self.assertEqual(tweens.name_to_alias['name1'], 'n1')
         self.assertEqual(tweens.order, [(INGRESS, 'n1')])
-        self.assertEqual(tweens.ingress_alias_names, ['n1'])
         tweens.add_implicit('name2', 'factory2', alias='n2')
         self.assertEqual(tweens.names, ['name1',  'name2'])
         self.assertEqual(tweens.factories,
@@ -65,7 +61,6 @@ class TestTweens(unittest.TestCase):
         self.assertEqual(tweens.name_to_alias['name2'], 'n2')
         self.assertEqual(tweens.order,
                          [(INGRESS, 'n1'), (INGRESS, 'n2')])
-        self.assertEqual(tweens.ingress_alias_names, ['n1', 'n2'])
         tweens.add_implicit('name3', 'factory3', alias='n3', over='name2')
         self.assertEqual(tweens.names,
                          ['name1',  'name2', 'name3'])
@@ -77,7 +72,6 @@ class TestTweens(unittest.TestCase):
         self.assertEqual(tweens.order,
                          [(INGRESS, 'n1'), (INGRESS, 'n2'),
                           ('n3', 'name2')])
-        self.assertEqual(tweens.ingress_alias_names, ['n1', 'n2'])
 
     def test___call___explicit(self):
         tweens = self._makeOne()
diff --git a/pyramid/tweens.py b/pyramid/tweens.py
index 5ada88b24..339b06275 100644
--- a/pyramid/tweens.py
+++ b/pyramid/tweens.py
@@ -67,7 +67,6 @@ class Tweens(object):
         self.names = []
         self.factories = {}
         self.order = []
-        self.ingress_alias_names = []
         self.alias_to_name = {INGRESS:INGRESS, MAIN:MAIN}
         self.name_to_alias = {INGRESS:INGRESS, MAIN:MAIN}
 
@@ -83,7 +82,6 @@ class Tweens(object):
         self.factories[name] = factory
         if under is None and over is None:
             under = INGRESS
-            self.ingress_alias_names.append(alias)
         if under is not None:
             self.order.append((under, alias))
         if over is not None:
@@ -95,7 +93,6 @@ class Tweens(object):
         graph = {}
         has_order = {}
         aliases = [INGRESS, MAIN]
-        ingress_alias_names = self.ingress_alias_names[:]
 
         for name in self.names:
             aliases.append(self.name_to_alias[name])
@@ -132,7 +129,6 @@ class Tweens(object):
             # as if it were added with no under or over in add_implicit
             if (not alias in has_order) and (alias not in (INGRESS, MAIN)):
                 order.append((INGRESS, alias))
-                ingress_alias_names.append(alias)
             add_node(alias)
 
         for a, b in order:
@@ -163,8 +159,8 @@ class Tweens(object):
         result = []
 
         for alias in sorted_aliases:
-            if alias not in (MAIN, INGRESS):
-                name = self.alias_to_name.get(alias, alias)
+            name = self.alias_to_name.get(alias, alias)
+            if name in self.names:
                 result.append((name, self.factories[name]))
 
         return result
-- 
cgit v1.2.3