diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-16 02:57:19 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-16 02:57:19 -0400 |
| commit | 7401b8eeded5d2d0167edabbc9f720f8ae235359 (patch) | |
| tree | 22635d4768befaac2b111af5da8ff248e8ef837b | |
| parent | c7cc885483dadeb44b5e9b900e01d61ca743a664 (diff) | |
| download | pyramid-7401b8eeded5d2d0167edabbc9f720f8ae235359.tar.gz pyramid-7401b8eeded5d2d0167edabbc9f720f8ae235359.tar.bz2 pyramid-7401b8eeded5d2d0167edabbc9f720f8ae235359.zip | |
use undefer instead of pulling the oxcart by hand
| -rw-r--r-- | pyramid/config/__init__.py | 8 |
1 files 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: |