summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-03-28 15:46:02 -0400
committerChris McDonough <chrism@plope.com>2011-03-28 15:46:02 -0400
commit560e6e5b7466cfb54e36a05b3855f8596170f07b (patch)
treecf75555308b3e17c5a51d1b256a4acde8d52379d
parentac46899fc75e3e56f8250ad51e26e4ff1ee69e28 (diff)
downloadpyramid-560e6e5b7466cfb54e36a05b3855f8596170f07b.tar.gz
pyramid-560e6e5b7466cfb54e36a05b3855f8596170f07b.tar.bz2
pyramid-560e6e5b7466cfb54e36a05b3855f8596170f07b.zip
remove bogus branch
-rw-r--r--pyramid/urldispatch.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/pyramid/urldispatch.py b/pyramid/urldispatch.py
index 5597594f0..be737201b 100644
--- a/pyramid/urldispatch.py
+++ b/pyramid/urldispatch.py
@@ -102,17 +102,19 @@ def _compile_route(route):
if not route.startswith('/'):
route = '/' + route
+
star = None
+
if '*' in route and not star_in_brackets.search(route):
route, star = route.rsplit('*', 1)
pat = route_re.split(route)
pat.reverse()
rpat = []
gen = []
- prefix = pat.pop()
- if prefix:
- rpat.append(re.escape(prefix))
- gen.append(prefix)
+ prefix = pat.pop() # invar: always at least one element (route='/'+route)
+ rpat.append(re.escape(prefix))
+ gen.append(prefix)
+
while pat:
name = pat.pop()
name = name[1:-1]