Patchwork D3331: util: set correct stack level on deprecation warnings

login
register
mail settings
Submitter phabricator
Date April 13, 2018, 9:30 p.m.
Message ID <differential-rev-PHID-DREV-iuqsmyy7jd5ll5jsit2s-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30893/
State Superseded
Headers show

Comments

phabricator - April 13, 2018, 9:30 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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)

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3331

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -3781,7 +3781,7 @@ 
         fn = pycompat.sysbytes(func.__name__)
         mn = modname or pycompat.sysbytes(func.__module__)[len('mercurial.'):]
         msg = "'util.%s' is deprecated, use '%s.%s'" % (fn, mn, fn)
-        nouideprecwarn(msg, version)
+        nouideprecwarn(msg, version, stacklevel=2)
         return func(*args, **kwargs)
     wrapped.__name__ = func.__name__
     return wrapped