[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/

["Zac Medico" <zmedico@gentoo.org>]

commit:     d9151dfb8144563119f016b439de2b0f53d8858e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 00:20:47 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 00:45:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d9151dfb

portdbapi.xmatch: remove deprecated *match-list

The bestmatch-list and match-list level arguments have been deprecated
since v2.2.0, commit 0d375f1105ad67c8b7e3b16b57cdbb367f99cd69.

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/dbapi/porttree.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index aa8b50a57..56955ec34 100644
--- a/lib/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
@@ -1165,18 +1165,6 @@ class portdbapi(dbapi):
 				else:
 					myval = ""
 
-		elif level == "bestmatch-list":
-			#dep match -- find best match but restrict search to sublist
-			warnings.warn("The 'bestmatch-list' mode of "
-				"portage.dbapi.porttree.portdbapi.xmatch is deprecated",
-				DeprecationWarning, stacklevel=2)
-			myval = best(list(self._iter_match(mydep, mylist)))
-		elif level == "match-list":
-			#dep match -- find all matches but restrict search to sublist (used in 2nd half of visible())
-			warnings.warn("The 'match-list' mode of "
-				"portage.dbapi.porttree.portdbapi.xmatch is deprecated",
-				DeprecationWarning, stacklevel=2)
-			myval = list(self._iter_match(mydep, mylist))
 		else:
 			raise AssertionError(
 				"Invalid level argument: '%s'" % level)