From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F157138334 for ; Mon, 24 Sep 2018 00:46:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25C1DE08F6; Mon, 24 Sep 2018 00:46:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 026E5E08F6 for ; Mon, 24 Sep 2018 00:46:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1052335CA6 for ; Mon, 24 Sep 2018 00:46:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4A003E2 for ; Mon, 24 Sep 2018 00:46:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1537749940.d9151dfb8144563119f016b439de2b0f53d8858e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/dbapi/porttree.py X-VCS-Directories: lib/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d9151dfb8144563119f016b439de2b0f53d8858e X-VCS-Branch: master Date: Mon, 24 Sep 2018 00:46:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 27a52dca-6247-4575-88c2-eeb26761f16f X-Archives-Hash: d4f76a102fc5d1495c5cea9f2d2db812 commit: d9151dfb8144563119f016b439de2b0f53d8858e Author: Zac Medico gentoo org> AuthorDate: Mon Sep 24 00:20:47 2018 +0000 Commit: Zac Medico gentoo 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 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)