diff options
| author | Chris McDonough <chrism@plope.com> | 2011-12-04 15:08:00 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-12-04 15:08:00 -0500 |
| commit | 4b0dc407f46a4a2330f756c422719fe5961373cf (patch) | |
| tree | c4416cf60611b94036e7783d5295df3d76f6469f | |
| parent | 82f67769c3f32b60ddec8bb16285cec99f86994c (diff) | |
| download | pyramid-4b0dc407f46a4a2330f756c422719fe5961373cf.tar.gz pyramid-4b0dc407f46a4a2330f756c422719fe5961373cf.tar.bz2 pyramid-4b0dc407f46a4a2330f756c422719fe5961373cf.zip | |
treat order exclusively as a grouping
| -rw-r--r-- | pyramid/config/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 52a7024a2..67df733d9 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -1042,7 +1042,7 @@ def resolveConflicts(actions): # executed before actions in a higher order. Within an order, # actions are executed sequentially based on original action ordering # ("i"). - order = action['order'] or i + order = action['order'] or 0 discriminator = action['discriminator'] # "ainfo" is a tuple of (order, i, action) where "order" is a |