diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-06 19:37:15 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-06 19:37:15 -0500 |
| commit | fd031f966f896eebb611aa4bd77aef4684ce9357 (patch) | |
| tree | 884e81c1c29de9296fa786a3259fb3e2a07d8cca | |
| parent | e139f845eca82443bbcd7fdc6c65191695f3394f (diff) | |
| parent | 8673fb4b8bea363bd7fb4ec469492f56e8d14bbb (diff) | |
| download | pyramid-fd031f966f896eebb611aa4bd77aef4684ce9357.tar.gz pyramid-fd031f966f896eebb611aa4bd77aef4684ce9357.tar.bz2 pyramid-fd031f966f896eebb611aa4bd77aef4684ce9357.zip | |
Merge branch 'csenger-master'
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | pyramid/traversal.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e66675e64..8dc422abf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,9 @@ Bug Fixes - The `self` argument was included in new methods of the ``ISession`` interface signature, causing ``pyramid_beaker`` tests to fail (jkrebs). +- Readd ``pyramid.traversal.model_path_tuple`` as an alias for + ``pyramid.traversal.resource_path_tuple`` for backwards compatibility. + Features -------- diff --git a/pyramid/traversal.py b/pyramid/traversal.py index f3377b0d0..f32b43493 100644 --- a/pyramid/traversal.py +++ b/pyramid/traversal.py @@ -352,6 +352,9 @@ def resource_path_tuple(resource, *elements): """ return tuple(_resource_path_list(resource, *elements)) +model_path_tuple = resource_path_tuple # b/w compat + + def _resource_path_list(resource, *elements): """ Implementation detail shared by resource_path and resource_path_tuple""" path = [loc.__name__ or '' for loc in lineage(resource)] |