From f646fe5800d1129ae79944956e125f51611350b1 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 20 Sep 2009 23:22:04 +0000 Subject: Minor speed tweaks. --- repoze/bfg/urldispatch.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'repoze/bfg/urldispatch.py') diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py index 7aba027e9..c1d1f71e4 100644 --- a/repoze/bfg/urldispatch.py +++ b/repoze/bfg/urldispatch.py @@ -10,16 +10,10 @@ _marker = object() class Route(object): def __init__(self, path, name=None, factory=None): self.path = path - self.matcher, self.generator = _compile_route(path) + self.match, self.generate = _compile_route(path) self.name = name self.factory = factory - def match(self, path): - return self.matcher(path) - - def generate(self, kw): - return self.generator(kw) - class RoutesRootFactory(object): def __init__(self, default_root_factory): self.default_root_factory = default_root_factory @@ -42,7 +36,10 @@ class RoutesRootFactory(object): return self.routes[name].generate(kw) def __call__(self, environ): - path = environ.get('PATH_INFO', '/') + try: + path = environ['PATH_INFO'] + except KeyError: + path = '/' for route in self.routelist: match = route.match(path) if match is not None: -- cgit v1.2.3