From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Wed, 11 Aug 2010 07:11:54 +0000 (+0200)
Subject: portage/dbapi/porttree.py: Remove deprecated functions, deprecate more cases
X-Git-Tag: v2.2_rc68~305
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=67dac3379abbf1def73c7b4484da43b851595e45;p=portage.git

portage/dbapi/porttree.py: Remove deprecated functions, deprecate more cases
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 886b765f7..bfd1033d2 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -63,21 +63,6 @@ class portdbapi(dbapi):
 	portdbapi_instances = []
 	_use_mutable = True
 
-	def _get_settings(self):
-		warnings.warn("Use portdbapi.settings instead of portdbapi.mysettings",
-			DeprecationWarning)
-		return self.settings
-
-	def _set_settings(self, settings):
-		warnings.warn("Use portdbapi.settings instead of portdbapi.mysettings",
-			DeprecationWarning)
-		self.settings = settings
-
-	def _del_settings (self):
-		warnings.warn("Use portdbapi.settings instead of portdbapi.mysettings",
-			DeprecationWarning)
-		del self.settings
-
 	mysettings = property(_get_settings, _set_settings, _del_settings,
 		"Deprecated self.mysettings, only for backward compatibility")
 
@@ -103,9 +88,7 @@ class portdbapi(dbapi):
 
 		porttree_root = self.settings['PORTDIR']
 
-		# always show this warning after this parameter
-		# is unused in stable portage
-		if _unused_param is not None and _unused_param != porttree_root:
+		if _unused_param is not None:
 			warnings.warn("The first parameter of the " + \
 				"portage.dbapi.porttree.portdbapi" + \
 				" constructor is now unused. Use " + \