This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3331

util: set correct stack level on deprecation warnings
ClosedPublic

Authored by martinvonz on Apr 13 2018, 5:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5b8a260769a2: util: set correct stack level on deprecation warnings
Summary

Without this patch, you'll get something like this:

<path>/mercurial/util.py:3784: DeprecationWarning: 'util.hgexecutable'
    is deprecated, use 'utils.procutil.hgexecutable'

(but on one line)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 13 2018, 5:29 PM
Closed by commit rHG5b8a260769a2: util: set correct stack level on deprecation warnings (authored by martinvonz). · Explain WhyApr 14 2018, 4:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (2 lines)

Diff 8257

mercurial/util.py

# Deprecation warnings for util.py splitting # Deprecation warnings for util.py splitting
### ###
def _deprecatedfunc(func, version, modname=None): def _deprecatedfunc(func, version, modname=None):
def wrapped(*args, **kwargs): def wrapped(*args, **kwargs):
fn = pycompat.sysbytes(func.__name__) fn = pycompat.sysbytes(func.__name__)
mn = modname or pycompat.sysbytes(func.__module__)[len('mercurial.'):] mn = modname or pycompat.sysbytes(func.__module__)[len('mercurial.'):]
msg = "'util.%s' is deprecated, use '%s.%s'" % (fn, mn, fn) msg = "'util.%s' is deprecated, use '%s.%s'" % (fn, mn, fn)
nouideprecwarn(msg, version) nouideprecwarn(msg, version, stacklevel=2)
return func(*args, **kwargs) return func(*args, **kwargs)
wrapped.__name__ = func.__name__ wrapped.__name__ = func.__name__
return wrapped return wrapped
defaultdateformats = dateutil.defaultdateformats defaultdateformats = dateutil.defaultdateformats
extendeddateformats = dateutil.extendeddateformats extendeddateformats = dateutil.extendeddateformats
makedate = _deprecatedfunc(dateutil.makedate, '4.6') makedate = _deprecatedfunc(dateutil.makedate, '4.6')
datestr = _deprecatedfunc(dateutil.datestr, '4.6') datestr = _deprecatedfunc(dateutil.datestr, '4.6')