# HG changeset patch # User Sylvain Thénault # Date 1250532177 -7200 # Node ID fdcb8a2bb6eb2f60e2846045e77039ea292f09f6 # Parent 5b42222d3b8812af04dd88859b5df333380b34c2 fix __init__ parameters diff -r 5b42222d3b88 -r fdcb8a2bb6eb view.py --- a/view.py Mon Aug 17 20:02:25 2009 +0200 +++ b/view.py Mon Aug 17 20:02:57 2009 +0200 @@ -357,7 +357,7 @@ default_rql = None def __init__(self, req, rset=None, **kwargs): - super(EntityStartupView, self).__init__(req, rset, **kwargs) + super(EntityStartupView, self).__init__(req, rset=rset, **kwargs) if rset is None: # this instance is not in the "entityview" category self.category = 'startupview' diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/action.py --- a/web/action.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/action.py Mon Aug 17 20:02:57 2009 +0200 @@ -53,7 +53,7 @@ id = None def __init__(self, req, rset, title, path, **kwargs): - Action.__init__(self, req, rset) + Action.__init__(self, req, rset=rset) self.title = req._(title) self._path = path self.__dict__.update(kwargs) diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/component.py --- a/web/component.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/component.py Mon Aug 17 20:02:57 2009 +0200 @@ -75,7 +75,7 @@ no_previous_page_link = no_next_page_link = u'' def __init__(self, req, rset, **kwargs): - super(NavigationComponent, self).__init__(req, rset, **kwargs) + super(NavigationComponent, self).__init__(req, rset=rset, **kwargs) self.starting_from = 0 self.total = rset.rowcount diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/controller.py --- a/web/controller.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/controller.py Mon Aug 17 20:02:57 2009 +0200 @@ -87,15 +87,15 @@ def process_rql(self, rql): """execute rql if specified""" # XXX assigning to self really necessary? - self.rset = None + self.cw_rset = None if rql: self.req.ensure_ro_rql(rql) if not isinstance(rql, unicode): rql = unicode(rql, self.req.encoding) pp = self.vreg['components'].select_or_none('magicsearch', self.req) if pp is not None: - self.rset = pp.process_query(rql, self.req) - return self.rset + self.cw_rset = pp.process_query(rql, self.req) + return self.cw_rset def check_expected_params(self, params): """check that the given list of parameters are specified in the form diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/facet.py --- a/web/facet.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/facet.py Mon Aug 17 20:02:57 2009 +0200 @@ -261,7 +261,7 @@ def __init__(self, req, rset=None, rqlst=None, filtered_variable=None, **kwargs): - super(AbstractFacet, self).__init__(req, rset, **kwargs) + super(AbstractFacet, self).__init__(req, rset=rset, **kwargs) assert rset is not None or rqlst is not None assert filtered_variable # facet retreived using `object_by_id` from an ajax call diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/form.py --- a/web/form.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/form.py Mon Aug 17 20:02:57 2009 +0200 @@ -47,7 +47,7 @@ return '%s#%s' % (self.req.url(), self.domid) def __init__(self, req, rset, **kwargs): - super(FormMixIn, self).__init__(req, rset, **kwargs) + super(FormMixIn, self).__init__(req, rset=rset, **kwargs) self.restore_previous_post(self.session_key()) def restore_previous_post(self, sessionkey): diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/views/editforms.py --- a/web/views/editforms.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/views/editforms.py Mon Aug 17 20:02:57 2009 +0200 @@ -412,7 +412,7 @@ def __init__(self, req, rset, **kwargs): kwargs.setdefault('__redirectrql', rset.printable_rql()) - super(TableEditForm, self).__init__(req, rset, **kwargs) + super(TableEditForm, self).__init__(req, rset=rset, **kwargs) for row in xrange(len(self.rset)): form = self.vreg['forms'].select('edition', self.req, rset=self.rset, row=row, diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/views/formrenderers.py --- a/web/views/formrenderers.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/views/formrenderers.py Mon Aug 17 20:02:57 2009 +0200 @@ -53,7 +53,7 @@ button_bar_class = u'formButtonBar' def __init__(self, req=None, rset=None, row=None, col=None, **kwargs): - super(FormRenderer, self).__init__(req, rset, row, col) + super(FormRenderer, self).__init__(req, rset=rset, row=row, col=col) if self._set_options(kwargs): raise ValueError('unconsumed arguments %s' % kwargs) diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/views/forms.py --- a/web/views/forms.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/views/forms.py Mon Aug 17 20:02:57 2009 +0200 @@ -77,7 +77,7 @@ def __init__(self, req, rset=None, row=None, col=None, submitmsg=None, mainform=True, **kwargs): - super(FieldsForm, self).__init__(req, rset, row=row, col=col) + super(FieldsForm, self).__init__(req, rset=rset, row=row, col=col) self.fields = list(self.__class__._fields_) for key, val in kwargs.items(): if key in NAV_FORM_PARAMETERS: diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/views/magicsearch.py --- a/web/views/magicsearch.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/views/magicsearch.py Mon Aug 17 20:02:57 2009 +0200 @@ -345,7 +345,7 @@ class MagicSearchComponent(Component): id = 'magicsearch' def __init__(self, req, rset=None): - super(MagicSearchComponent, self).__init__(req, rset) + super(MagicSearchComponent, self).__init__(req, rset=rset) processors = [] self.by_name = {} for processorcls in self.vreg['components']['magicsearch_processor']: diff -r 5b42222d3b88 -r fdcb8a2bb6eb web/views/urlpublishing.py --- a/web/views/urlpublishing.py Mon Aug 17 20:02:25 2009 +0200 +++ b/web/views/urlpublishing.py Mon Aug 17 20:02:57 2009 +0200 @@ -199,7 +199,7 @@ evaluators = sorted(self.vreg['urlrewriting'].all_objects(), key=lambda x: x.priority, reverse=True) for rewritercls in evaluators: - rewriter = rewritercls() + rewriter = rewritercls(req) try: # XXX we might want to chain url rewrites return rewriter.rewrite(req, uri)