- Use ``hash()`` rather than ``id()`` when computing the "phash" of a

  custom route/view predicate in order to allow the custom predicate
  some control over which predicates are "equal".

- Use ``response.headerlist.append`` instead of
  ``response.headers.add`` in
  ``repoze.bfg.request.add_global_response_headers`` in case the
  response is not a WebOb response.

3 files changed, 15 insertions, 18 deletions

diff --git a/repoze/bfg/tests/test_authentication.py b/repoze/bfg/tests/test_authentication.py
index bce80ca20..d020a11a6 100644
--- a/repoze/bfg/tests/test_authentication.py
+++ b/repoze/bfg/tests/test_authentication.py
@@ -419,8 +419,8 @@ class TestAuthTktCookieHelper(unittest.TestCase):
         self.assertEqual(len(request.callbacks), 1)
         response = DummyResponse()
         request.callbacks[0](None, response)
-        self.assertEqual(len(response.headers.added), 3)
-        self.assertEqual(response.headers.added[0][0], 'Set-Cookie')
+        self.assertEqual(len(response.headerlist), 3)
+        self.assertEqual(response.headerlist[0][0], 'Set-Cookie')
 
     def test_remember(self):
         plugin = self._makeOne('secret')
@@ -658,14 +658,7 @@ class DummyAuthTktModule(object):
     class BadTicket(Exception):
         pass
 
-class DummyHeaders:
-    def __init__(self):
-        self.added = []
-
-    def add(self, k, v):
-        self.added.append((k, v))
-
 class DummyResponse:
     def __init__(self):
-        self.headers = DummyHeaders()
+        self.headerlist = []
         
diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index 232cbd6bb..1ee2c1018 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -3392,6 +3392,16 @@ class Test__make_predicates(unittest.TestCase):
             )
         self.failUnless(order1 > order2)
 
+    def test_different_custom_predicates_with_same_hash(self):
+        class PredicateWithHash(object):
+            def __hash__(self):
+                return 1
+        a = PredicateWithHash()
+        b = PredicateWithHash()
+        _, _, a_phash = self._callFUT(custom=(a,))
+        _, _, b_phash = self._callFUT(custom=(b,))
+        self.assertEqual(a_phash, b_phash)
+
     def test_traverse_has_remainder_already(self):
         order, predicates, phash = self._callFUT(traverse='/1/:a/:b')
         self.assertEqual(len(predicates), 1)
diff --git a/repoze/bfg/tests/test_request.py b/repoze/bfg/tests/test_request.py
index 8d23e360f..0248e10be 100644
--- a/repoze/bfg/tests/test_request.py
+++ b/repoze/bfg/tests/test_request.py
@@ -206,7 +206,7 @@ class Test_add_global_response_headers(unittest.TestCase):
         self._callFUT(request, [('c', 1)])
         self.assertEqual(len(request.response_callbacks), 1)
         request.response_callbacks[0](None, response)
-        self.assertEqual(response.headers.added,  [('c', 1)] )
+        self.assertEqual(response.headerlist,  [('c', 1)] )
 
 class DummyRequest:
     def __init__(self, environ=None):
@@ -221,14 +221,8 @@ class DummyNewRequestEvent:
     def __init__(self, request):
         self.request = request
         
-class DummyHeaders:
-    def __init__(self):
-        self.added = []
-    def add(self, k, v):
-        self.added.append((k, v))
-
 class DummyResponse:
     def __init__(self):
-        self.headers = DummyHeaders()
+        self.headerlist = []