# HG changeset patch # User Sylvain Thénault # Date 1268387563 -3600 # Node ID 4a42d700c52d20130dd5e99e6e8822c2f6c91be0 # Parent 39fc30001a201fdd3d15a2a6b377bf635191d05a [web] stop using deprecated merge_dicts diff -r 39fc30001a20 -r 4a42d700c52d web/component.py --- a/web/component.py Fri Mar 12 10:52:04 2010 +0100 +++ b/web/component.py Fri Mar 12 10:52:43 2010 +0100 @@ -14,7 +14,6 @@ from logilab.mtconverter import xml_escape from cubicweb import role -from cubicweb.utils import merge_dicts from cubicweb.view import Component from cubicweb.selectors import ( paginated_rset, one_line_rset, primary_view, match_context_prop, @@ -116,8 +115,9 @@ del params[self.stop_param] def page_url(self, path, params, start, stop): - params = merge_dicts(params, {self.start_param : start, - self.stop_param : stop,}) + params = dict(params) + params.update({self.start_param : start, + self.stop_param : stop,}) if path == 'json': rql = params.pop('rql', self.cw_rset.printable_rql()) # latest 'true' used for 'swap' mode