# HG changeset patch # User Pierre-Yves David # Date 1364392302 -3600 # Node ID 772cd62e12955cc8013564490986905aaa89ebdb # Parent 2e0c9331e0210d07eb515e2c2c0cb4624dc9f8b7 [utils] drop pre-3.7 compat in util Dropping of API deprecated since 3.7 decided in #2772958 diff -r 2e0c9331e021 -r 772cd62e1295 utils.py --- a/utils.py Wed Mar 27 14:50:58 2013 +0100 +++ b/utils.py Wed Mar 27 14:51:42 2013 +0100 @@ -263,10 +263,7 @@ def add_post_inline_script(self, content): self.post_inlined_scripts.append(content) - def add_onload(self, jscode, jsoncall=_MARKER): - if jsoncall is not _MARKER: - warn('[3.7] specifying jsoncall is not needed anymore', - DeprecationWarning, stacklevel=2) + def add_onload(self, jscode): self.add_post_inline_script(u"""$(cw).one('server-response', function(event) { %s});""" % jscode) @@ -567,14 +564,6 @@ return 'javascript: ' + PERCENT_IN_URLQUOTE_RE.sub(r'%25', javascript_code) -@deprecated('[3.7] merge_dicts is deprecated') -def merge_dicts(dict1, dict2): - """update a copy of `dict1` with `dict2`""" - dict1 = dict(dict1) - dict1.update(dict2) - return dict1 - - def parse_repo_uri(uri): """ transform a command line uri into a (protocol, hostport, appid), e.g: -> 'inmemory', None, ''