[web] stop using deprecated merge_dicts
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 12 Mar 2010 10:52:43 +0100
changeset 4882 4a42d700c52d
parent 4881 39fc30001a20
child 4883 11899d28337f
[web] stop using deprecated merge_dicts
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