| 1 |
commit: d9151dfb8144563119f016b439de2b0f53d8858e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 24 00:20:47 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 24 00:45:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d9151dfb |
| 7 |
|
| 8 |
portdbapi.xmatch: remove deprecated *match-list |
| 9 |
|
| 10 |
The bestmatch-list and match-list level arguments have been deprecated |
| 11 |
since v2.2.0, commit 0d375f1105ad67c8b7e3b16b57cdbb367f99cd69. |
| 12 |
|
| 13 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 14 |
|
| 15 |
lib/portage/dbapi/porttree.py | 12 ------------ |
| 16 |
1 file changed, 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py |
| 19 |
index aa8b50a57..56955ec34 100644 |
| 20 |
--- a/lib/portage/dbapi/porttree.py |
| 21 |
+++ b/lib/portage/dbapi/porttree.py |
| 22 |
@@ -1165,18 +1165,6 @@ class portdbapi(dbapi): |
| 23 |
else: |
| 24 |
myval = "" |
| 25 |
|
| 26 |
- elif level == "bestmatch-list": |
| 27 |
- #dep match -- find best match but restrict search to sublist |
| 28 |
- warnings.warn("The 'bestmatch-list' mode of " |
| 29 |
- "portage.dbapi.porttree.portdbapi.xmatch is deprecated", |
| 30 |
- DeprecationWarning, stacklevel=2) |
| 31 |
- myval = best(list(self._iter_match(mydep, mylist))) |
| 32 |
- elif level == "match-list": |
| 33 |
- #dep match -- find all matches but restrict search to sublist (used in 2nd half of visible()) |
| 34 |
- warnings.warn("The 'match-list' mode of " |
| 35 |
- "portage.dbapi.porttree.portdbapi.xmatch is deprecated", |
| 36 |
- DeprecationWarning, stacklevel=2) |
| 37 |
- myval = list(self._iter_match(mydep, mylist)) |
| 38 |
else: |
| 39 |
raise AssertionError( |
| 40 |
"Invalid level argument: '%s'" % level) |
Archives