From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 24 Dec 2012 21:12:03 +0000 (-0800)
Subject: vardbapi: tweak deprecated constructor param
X-Git-Tag: v2.2.0_alpha150~90
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=074becc02bf28e3783d672967cae08aa35116809;p=portage.git

vardbapi: tweak deprecated constructor param
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 344a4f9b4..25128bf32 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -112,7 +112,8 @@ class vardbapi(dbapi):
 	_aux_cache_keys_re = re.compile(r'^NEEDED\..*$')
 	_aux_multi_line_re = re.compile(r'^(CONTENTS|NEEDED\..*)$')
 
-	def __init__(self, _unused_param=None, categories=None, settings=None, vartree=None):
+	def __init__(self, _unused_param=DeprecationWarning,
+		categories=None, settings=None, vartree=None):
 		"""
 		The categories parameter is unused since the dbapi class
 		now has a categories property that is generated from the
@@ -142,11 +143,11 @@ class vardbapi(dbapi):
 			settings = portage.settings
 		self.settings = settings
 
-		if _unused_param is not None and _unused_param != settings['ROOT']:
+		if _unused_param is not DeprecationWarning:
 			warnings.warn("The first parameter of the "
 				"portage.dbapi.vartree.vardbapi"
-				" constructor is now unused. Use "
-				"settings['ROOT'] instead.",
+				" constructor is now unused. Instead "
+				"settings['ROOT'] is used.",
 				DeprecationWarning, stacklevel=2)
 
 		self._eroot = settings['EROOT']