From 6b9be19e4d3f2b60296e44d3f304a75298a2debd Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 9 Aug 2009 05:26:06 +0000 Subject: - Change urldispatch internals: Route object is now constructed using a path, a name, and a factory instead of a name, a matcher, a generator, and a factory. --- repoze/bfg/urldispatch.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'repoze/bfg/urldispatch.py') diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py index 7a35f76f1..747faace7 100644 --- a/repoze/bfg/urldispatch.py +++ b/repoze/bfg/urldispatch.py @@ -8,10 +8,10 @@ from repoze.bfg.traversal import quote_path_segment _marker = object() class Route(object): - def __init__(self, name, matcher, generator, factory): + def __init__(self, path, name=None, factory=None): + self.path = path + self.matcher, self.generator = _compile_route(path) self.name = name - self.matcher = matcher - self.generator = generator self.factory = factory def match(self, path): @@ -29,9 +29,8 @@ class RoutesRootFactory(object): def has_routes(self): return bool(self.routelist) - def connect(self, name, path, factory=None): - matcher, generator = _compile_route(path) - route = Route(name, matcher, generator, factory) + def connect(self, path, name, factory=None): + route = Route(path, name, factory) self.routelist.append(route) self.routes[name] = route return route -- cgit v1.2.3