From 7401b8eeded5d2d0167edabbc9f720f8ae235359 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 16 Aug 2012 02:57:19 -0400 Subject: use undefer instead of pulling the oxcart by hand --- pyramid/config/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 547fa9e4a..6010740ca 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -43,7 +43,6 @@ from pyramid.registry import ( Introspectable, Introspector, Registry, - Deferred, undefer, ) @@ -551,10 +550,9 @@ class Configurator( introspectables = () if autocommit: - if isinstance(discriminator, Deferred): - # callables can depend on the side effects of resolving a - # deferred discriminator - discriminator.resolve() + # callables can depend on the side effects of resolving a + # deferred discriminator + undefer(discriminator) if callable is not None: callable(*args, **kw) for introspectable in introspectables: -- cgit v1.2.3