diff -r 0b715e732330 -r 1282dc6525c5 web/views/urlpublishing.py --- a/web/views/urlpublishing.py Mon Aug 17 19:21:26 2009 +0200 +++ b/web/views/urlpublishing.py Mon Aug 17 19:21:45 2009 +0200 @@ -28,8 +28,7 @@ from rql import TypeResolverException from cubicweb import RegistryException, typed_eid -from cubicweb.web import NotFound, Redirect -from cubicweb.web.component import Component, Component +from cubicweb.web import NotFound, Redirect, component class PathDontMatch(Exception): @@ -37,7 +36,7 @@ a path """ -class URLPublisherComponent(Component): +class URLPublisherComponent(component.Component): """associate url's path to view identifier / rql queries, by applying a chain of urlpathevaluator components. @@ -51,12 +50,14 @@ something else than `PathDontMatch` will stop the handlers chain. """ id = 'urlpublisher' + vreg = None # XXX necessary until property for deprecation warning is on appobject - def __init__(self, default_method='view'): + def __init__(self, vreg, default_method='view'): super(URLPublisherComponent, self).__init__() + self.vreg = vreg self.default_method = default_method evaluators = [] - for evaluatorcls in self.vreg['components']['urlpathevaluator']: + for evaluatorcls in vreg['components']['urlpathevaluator']: # instantiation needed evaluator = evaluatorcls(self) evaluators.append(evaluator) @@ -98,13 +99,14 @@ return pmid, rset -class URLPathEvaluator(Component): +class URLPathEvaluator(component.Component): __abstract__ = True id = 'urlpathevaluator' + vreg = None # XXX necessary until property for deprecation warning is on appobject def __init__(self, urlpublisher): self.urlpublisher = urlpublisher - + self.vreg = urlpublisher.vreg class RawPathEvaluator(URLPathEvaluator): """handle path of the form::