summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-21 01:44:59 -0400
committerChris McDonough <chrism@plope.com>2011-08-21 01:44:59 -0400
commit39c260a3926f791df805e88d7edd65726beab8dd (patch)
treef2e02cd7d2443788536534dfc0098abf59354205
parent78e4cdd326f69c3b57a0c75fffe41261b6d57c36 (diff)
parentaccc4f4518ed6d204f3dea4579a3747f66e6999b (diff)
downloadpyramid-39c260a3926f791df805e88d7edd65726beab8dd.tar.gz
pyramid-39c260a3926f791df805e88d7edd65726beab8dd.tar.bz2
pyramid-39c260a3926f791df805e88d7edd65726beab8dd.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/router.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/router.py b/pyramid/router.py
index 248ab3b5b..746cf88cf 100644
--- a/pyramid/router.py
+++ b/pyramid/router.py
@@ -95,7 +95,7 @@ class Router(object):
route.name,
request.path_info,
route.pattern, match,
- route.predicates)
+ ', '.join([p.__text__ for p in route.predicates]))
)
logger and logger.debug(msg)