summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-04 00:09:09 -0400
committerChris McDonough <chrism@plope.com>2011-09-04 00:09:09 -0400
commitf00c0f7fddf98efacd1e498e13d1d4fd31674875 (patch)
treec05cca36e2caba8e3c48aa35b102e6c049c79029
parent25be339daa0448bf64b4dba03c08205b571a1cb0 (diff)
downloadpyramid-f00c0f7fddf98efacd1e498e13d1d4fd31674875.tar.gz
pyramid-f00c0f7fddf98efacd1e498e13d1d4fd31674875.tar.bz2
pyramid-f00c0f7fddf98efacd1e498e13d1d4fd31674875.zip
warnings
-rw-r--r--pyramid/config/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 8ee0bfac4..38a583938 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -819,7 +819,7 @@ class Configurator(
# this class is licensed under the ZPL (stolen from Zope)
class ActionState(object):
def __init__(self):
- self.actions = []
+ self.actions = [] # NB "actions" is an API, dep'd upon by pyramid_zcml
self._seen_files = set()
def processSpec(self, spec):
@@ -840,6 +840,10 @@ class ActionState(object):
includepath=(), info=''):
"""Add an action with the given discriminator, callable and arguments
"""
+ # NB: note that the ordering and composition of the action tuple should
+ # not change without first ensuring that ``pyramid_zcml`` appends
+ # similarly-composed actions to our .actions variable (as silly as
+ # the composition and ordering is).
if kw is None:
kw = {}
action = (discriminator, callable, args, kw, includepath, info, order)