From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Oct 2011 02:32:49 +0000 (-0700)
Subject: stacklevel=3 for properties warnings
X-Git-Tag: v2.2.0_alpha72~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df6078a76dc549b83de5a056a6a1dc52bdd69107;p=portage.git

stacklevel=3 for properties warnings

There's an extra level for the @property wrapper.
---

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index a2b923248..626d4719c 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -77,7 +77,7 @@ class FakeVartree(vartree):
 			"_emerge.FakeVartree.FakeVartree"
 			" is deprecated. Use "
 			"settings['ROOT'] instead.",
-			DeprecationWarning, stacklevel=2)
+			DeprecationWarning, stacklevel=3)
 		return self.settings['ROOT']
 
 	def _match_wrapper(self, cpv, use_cache=1):
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 39bb030f9..0fb8be9c5 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -349,7 +349,7 @@ class binarytree(object):
 			"portage.dbapi.bintree.binarytree"
 			" is deprecated. Use "
 			"settings['ROOT'] instead.",
-			DeprecationWarning, stacklevel=2)
+			DeprecationWarning, stacklevel=3)
 		return self.settings['ROOT']
 
 	def move_ent(self, mylist, repo_match=None):
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 6f3d90f73..fc7feb3ba 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -1097,7 +1097,7 @@ class portagetree(object):
 			"portage.dbapi.porttree.portagetree" + \
 			" is deprecated. Use " + \
 			"settings['ROOT'] instead.",
-			DeprecationWarning, stacklevel=2)
+			DeprecationWarning, stacklevel=3)
 		return self.settings['ROOT']
 
 	def dep_bestmatch(self,mydep):
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index f76645355..7f94cc5ca 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -180,7 +180,7 @@ class vardbapi(dbapi):
 			"portage.dbapi.vartree.vardbapi"
 			" is deprecated. Use "
 			"settings['ROOT'] instead.",
-			DeprecationWarning, stacklevel=2)
+			DeprecationWarning, stacklevel=3)
 		return self.settings['ROOT']
 
 	def getpath(self, mykey, filename=None):
@@ -1183,7 +1183,7 @@ class vartree(object):
 			"portage.dbapi.vartree.vartree"
 			" is deprecated. Use "
 			"settings['ROOT'] instead.",
-			DeprecationWarning, stacklevel=2)
+			DeprecationWarning, stacklevel=3)
 		return self.settings['ROOT']
 
 	def getpath(self, mykey, filename=None):