summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-07 23:53:12 -0500
committerChris McDonough <chrism@plope.com>2010-12-07 23:53:12 -0500
commit7d8132a8f72f81ead76bd71a6602e2db9b27502d (patch)
treeb36ac2e15010658ad915aba1201bfad44a1fc37c
parentfd4a93d57096aa1a27316aeadb73de99f369d2e8 (diff)
downloadpyramid-7d8132a8f72f81ead76bd71a6602e2db9b27502d.tar.gz
pyramid-7d8132a8f72f81ead76bd71a6602e2db9b27502d.tar.bz2
pyramid-7d8132a8f72f81ead76bd71a6602e2db9b27502d.zip
comment
-rw-r--r--pyramid/configuration.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pyramid/configuration.py b/pyramid/configuration.py
index 3de194d23..c0fb8ce78 100644
--- a/pyramid/configuration.py
+++ b/pyramid/configuration.py
@@ -108,10 +108,11 @@ def config_method(wrapped):
context = self._ctx
if not context.autocommit:
if not context.info:
- # try to provide more accurate info for conflict reports by
+ # Try to provide more accurate info for conflict reports by
# wrapping the context in a decorator and attaching caller info
# to it, unless the context already has info (if it already has
# info, it's likely a context generated by a ZCML directive).
+ # This is nasty.
newctx = GroupingContextDecorator(context)
try:
f = traceback.extract_stack(limit=3)
@@ -2905,3 +2906,4 @@ class PyramidConfigurationMachine(ConfigurationMachine):
return False
self._seen_files.add(spec)
return True
+