From 06b839f8f0b4c4c202ac10042241c00883b403d1 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Fri, 18 Apr 2014 15:48:29 -0600
Subject: _add_subscriber should resolve dotted names

---
 pyramid/config/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 32cf82fba..ebaae38a9 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -481,6 +481,7 @@ class Configurator(
 
     def _add_predicate(self, type, name, factory, weighs_more_than=None,
                        weighs_less_than=None):
+        factory = self.maybe_dotted(factory)
         discriminator = ('%s predicate' % type, name)
         intr = self.introspectable(
             '%s predicates' % type,
@@ -488,7 +489,7 @@ class Configurator(
             '%s predicate named %s' % (type, name),
             '%s predicate' % type)
         intr['name'] = name
-        intr['factory'] = self.maybe_dotted(factory)
+        intr['factory'] = factory
         intr['weighs_more_than'] = weighs_more_than
         intr['weighs_less_than'] = weighs_less_than
         def register():
-- 
cgit v1.2.3


From 8e90d62c0d50565e717738901e8a10a865ac1258 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Fri, 18 Apr 2014 15:49:59 -0600
Subject: Add information to CHANGES

---
 CHANGES.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 264497f5b..3d2b248ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,10 @@
 Next release
 ============
 
-- ...
+- Fix an issue whereby predicates would be resolved as maybe_dotted in the
+  introspectable but not when passed for registration. This would mean that
+  add_route_predicate for example can not take a string and turn it into the
+  actual callable function.
 
 1.5 (2014-04-08)
 ================
-- 
cgit v1.2.3