diff options
| -rw-r--r-- | pyramid/config/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 67df733d9..3ffbdbb47 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -1073,7 +1073,8 @@ def resolveConflicts(actions): # shortest include path. We break sorting ties using "order", then # "i". def bypath(ainfo): - return ainfo[2]['includepath'], ainfo[0], ainfo[1] + path, order, i = ainfo[2]['includepath'], ainfo[0], ainfo[1] + return path, order, i ainfos.sort(key=bypath) ainfo, rest = ainfos[0], ainfos[1:] |